积分功能增加

app.json

@@ -5,6 +5,7 @@
     "pages/user/all/all",
     "pages/cart/cart",
     "pages/areacart/areacart",
+    "pages/centcart/centcart",
     "pages/projects/projects",
     "pages/helpfarm/helpfarm",
     "pages/helpfarm/helpfarm-detail/helpfarm-detail",
@@ -37,6 +38,9 @@
         "pages/user/address/address",
         "pages/user/newAddress/newAddress",
         "pages/user/applyLeader/applyLeader",
+        "pages/user/integral/integral",
+        "pages/user/integralDetail/integralDetail",
+        "pages/user/integral/checkin/checkin",
         "pages/user/radish/radish",
         "pages/user/radishDetail/radishDetail",
         "pages/user/orders/orders",

packageUser/pages/user/integral/checkin/checkin.js

@@ -0,0 +1,62 @@
+var _request = require('../../../../../utils/request.js')
+var util = require('../../../../../utils/util.js')
+Page({
+  data: {
+    list: [],
+    more: true,
+    cent: 0
+  },
+  onLoad: function (options) {
+    this.getBalanceInfo()
+    this.getCentAct()
+//  this.getBalanceList()
+  },
+  onShow () {
+  },
+  getBalanceInfo () {
+    var that = this
+    var url = 'v1/user/cent/info'
+    var params = {
+    }
+    var success = function (res) {
+      var result = res.data.total
+      that.setData({
+        cent: result
+      })
+      console.log('getBalanceInfo',result)
+    }
+    _request.$get(url, params, success)
+  },
+  getCentAct(){
+  	var that = this
+    var url = 'v1/task_sign/daily/check'
+    var params = {
+    }
+    var success = function (res) {
+      var result = res.data
+      that.setData({
+        list: result
+      })
+      console.log('getCentAct',result)
+    }
+    _request.$get(url, params, success)
+  },
+  checkin(){
+  	var that = this
+    var url = 'v1/task_sign/daily/day'
+    var params = {
+    }
+    var success = function (res) {
+      var result = res.data
+      console.log('checkin',result)
+      that.getBalanceInfo()
+    	that.getCentAct()
+    }
+    _request.$post(url, params, success)
+  },
+  onShareAppMessage: function (val) {
+    return _request.share({
+      sc: 'xcx_user_radish'
+    })
+  }
+})

packageUser/pages/user/integral/checkin/checkin.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "每日签到",
+  "usingComponents": {
+    "format-time": "../../../../../component/formatTime/formatTime"
+  },
+  "backgroundColor": "#f3f3f3"
+}

packageUser/pages/user/integral/checkin/checkin.wxml

@@ -0,0 +1,73 @@
+<view class="bg" style="    background: #f3f3f3;">
+  <view class="qd-card">
+  	<h3>连续签到可获得相应积分</h3>
+		<ul>
+			<li>
+				<div class="{{list.today_everyday_no > 1 || list.today_everyday_no == 1 && !list.today_everyday_ok ?'qd-card-box over':'qd-card-box'}}">
+					<span>第1天</span>
+					<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
+					<b>+{{list.cent_award_conf.one_day / 100}}</b>
+				</div>
+			</li>
+			<li>
+				<div class="{{list.today_everyday_no > 2 || list.today_everyday_no == 2 && !list.today_everyday_ok ?'qd-card-box over':'qd-card-box'}}">
+					<span>第2天</span>
+					<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
+					<b>+{{list.cent_award_conf.two_day / 100}}</b>
+				</div>
+			</li>
+			<li>
+				<div class="{{list.today_everyday_no > 3 || list.today_everyday_no == 3 && !list.today_everyday_ok ?'qd-card-box over':'qd-card-box'}}">
+					<span>第3天</span>
+					<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
+					<b>+{{list.cent_award_conf.three_day / 100}}</b>
+				</div>
+			</li>
+			<li>
+				<div class="{{list.today_everyday_no > 4 || list.today_everyday_no == 4 && !list.today_everyday_ok ?'qd-card-box over':'qd-card-box'}}">
+					<span>第4天</span>
+					<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
+					<b>+{{list.cent_award_conf.four_day / 100}}</b>
+				</div>
+			</li>
+			<li>
+				<div class="{{list.today_everyday_no > 5 || list.today_everyday_no == 5 && !list.today_everyday_ok ?'qd-card-box over':'qd-card-box'}}">
+					<span>第5天</span>
+					<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
+					<b>+{{list.cent_award_conf.five_day / 100}}</b>
+				</div>
+			</li>
+			<li>
+				<div class="{{list.today_everyday_no > 6 || list.today_everyday_no == 6 && !list.today_everyday_ok ?'qd-card-box over':'qd-card-box'}}">
+					<span>第6天</span>
+					<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
+					<b>+{{list.cent_award_conf.six_day / 100}}</b>
+				</div>
+			</li>
+			<li>
+				<div class="{{list.today_everyday_no > 7 || list.today_everyday_no == 7 && !list.today_everyday_ok ?'qd-card-box over':'qd-card-box'}}">
+					<span>第7天</span>
+					<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
+					<b>+{{list.cent_award_conf.seven_day / 100}}</b>
+				</div>
+			</li>
+		</ul>
+		
+		<button type="button" class="qd-btn cancheckin" wx:if="{{ list.today_everyday_ok }}" bindtap="checkin">点我签到</button>
+		<button type="button" class="qd-btn" wx:else>今日已签到</button>
+		
+		<view class="has-jf">现有 <span>{{cent / 100}}</span> 积分</view>
+  </view>
+  <view class="task-list">
+  	<h3><b>其他任务</b></h3>
+  	<ul>
+  		<li>
+  			<div class="task-list-box">
+  				<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
+	  			<h4>分享好友得积分<!--<small>奖励50-1000积分</small>--></h4>
+	  			<button type="button" data-name="shareBtn" open-type="share">分享</button>
+  			</div>
+  		</li>
+  	</ul>
+  </view>
+</view>

packageUser/pages/user/integral/checkin/checkin.wxss

@@ -0,0 +1,158 @@
+.qd-card{
+	padding: 30rpx;
+	background: linear-gradient(#f9ecd8,#f3f3f3);
+}
+.qd-card h3{
+	    font-size: 30rpx;
+    font-weight: normal;
+    display: block;
+    text-align: center;
+    color: #d89b3c;
+}
+.qd-card ul{
+    display: block;
+    padding: 30rpx 0;
+    width: 100%;
+    overflow: hidden;
+    border-box
+}
+.qd-card ul li{
+	    background: #eee;
+    width: 23%;
+    float: left;
+    display: block;
+    margin: 1%;
+}
+.qd-card ul li:nth-child(5){
+	margin-left: 12.5%;
+}
+.qd-card-box{
+    text-align: center;
+    background: #FFF;
+    padding: 25rpx 15rpx;
+    box-sizing: border-box;
+    overflow: hidden;
+    display: block;
+    border: 1px solid #eee;
+    position: relative;
+}
+.qd-card-box.over{
+	background: #eee;
+}
+.qd-card-box.over::after{
+	content:'已 签';
+    position: absolute;
+    top: 36%;
+    color: #F44336;
+    border: 2px solid;
+    padding: 10rpx 30rpx;
+    font-weight: bold;
+    border-radius: 2px;
+    transform: rotate(-45deg);
+    left: 10%;
+    background: rgba(255,255,255,0.1);
+    font-size: 30rpx;
+}
+.qd-card-box span{
+	font-size: 20rpx;
+	color: #999;
+	display: block;
+	margin-bottom: 10rpx;
+}
+.qd-card-box image{
+	width: 35px;
+	height: 35px;
+	display: block;
+	margin: 0 auto;
+	margin-bottom: 10rpx;
+}
+.qd-card-box b{
+	font-size: 26rpx;
+	color: #666;
+	display: block;
+	font-weight: bold;
+}
+.qd-btn{
+    width: 40%;
+    padding: 15rpx 35rpx;
+    font-size: 30rpx;
+    background: #c7c7c7;
+    margin: 35rpx auto 15rpx;
+    border-radius: 5px;
+    color: #fff;
+}
+.cancheckin{
+	background: #eab86a;
+}
+.has-jf{
+	font-size: 30rpx;
+	text-align: center;
+}
+.has-jf span{
+	color: #e16e72;
+}
+.task-list{}
+.task-list h3{
+    position: relative;
+    display: block;
+    text-align: center;
+    margin: 15px;
+}
+.task-list h3::after{
+content: '';
+    position: absolute;
+    height: 1rpx;
+    background: #999;
+    width: 100%;
+    left: 0;
+    top: calc(50% - 0.5rpx);
+}
+.task-list h3 b{
+    z-index: 1;
+        background: #f3f3f3;
+    position: relative;
+    padding: 0 15px;
+    display: inline-block;
+    color: #999;
+}
+.task-list ul{
+	display: block;
+    padding: 15px;
+}
+.task-list ul li{
+	display: block;
+    background: #FFF;
+    border-radius: 4px;
+}
+.task-list-box{
+	padding: 15px;
+    display: block;
+}
+.task-list-box image{
+	    width: 100rpx;
+    height: 100rpx;
+    display: inline-block;
+    vertical-align: middle;
+}
+.task-list-box h4{
+	display: inline-block;
+    vertical-align: middle;
+    margin-left: 25rpx;
+    font-size: 34rpx;
+    color: #666;
+}
+.task-list-box h4 small{
+	display: block;
+    font-size: 24rpx;
+    color: #F44336;
+}
+.task-list-box button{
+	    float: right;
+    font-size: 28rpx;
+    background: #F44336;
+    color: #fff;
+    border-radius: 45px;
+    padding: 15rpx 30rpx;
+    line-height: inherit;
+    margin-top: 20rpx;
+}

packageUser/pages/user/integral/integral.js

@@ -0,0 +1,69 @@
+var _request = require('../../../../utils/request.js')
+var util = require('../../../../utils/util.js')
+Page({
+  data: {
+    page: 1,
+    per_page: 20,
+    list: [],
+    more: true,
+    balance: 0
+  },
+  onLoad: function (options) {
+    this.getBalanceInfo()
+    this.getBalanceList()
+  },
+  onShow () {
+  },
+  onReachBottom: function () {
+    if (this.data.more) {
+      var page = this.data.page + 1
+      this.setData({
+        page: page
+      })
+      this.getBalanceList()
+    }
+  },
+  getBalanceInfo () {
+    var that = this
+    var url = 'v1/user/cent/info'
+    var params = {
+    }
+    var success = function (res) {
+      var result = res.data.total
+      that.setData({
+        balance: result
+      })
+    }
+    _request.$get(url, params, success)
+  },
+  getBalanceList () {
+    var that = this
+    var url = 'v1/user/cent/balances'
+    var params = {
+      page: this.data.page,
+      per_page: this.data.per_page
+    }
+    var success = function (res) {
+      var result = that.data.list.concat(res.data.balance_list || [])
+      that.setData({
+        list: result
+      })
+      var listMore = res.data.balance_count > that.data.list.length
+      that.setData({
+        more: listMore
+      })
+    }
+    _request.$get(url, params, success)
+  },
+  getDetail (val) {
+    var id = val.currentTarget.dataset.val
+    wx.navigateTo({
+      url: '/packageUser/pages/user/integralDetail/integralDetail?id=' + id
+    })
+  },
+  onShareAppMessage: function (val) {
+    return _request.share({
+      sc: 'xcx_user_radish'
+    })
+  }
+})

packageUser/pages/user/integral/integral.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "积分",
+  "usingComponents": {
+    "format-time": "../../../../component/formatTime/formatTime"
+  },
+  "backgroundColor": "#f3f3f3"
+}

packageUser/pages/user/integral/integral.wxml

@@ -0,0 +1,23 @@
+<view class="bg">
+  <view class="radish-top">
+    <view class="radish-top__title">我的积分</view>
+    <view class="radish-top__count">{{balance / 100}}</view>
+    <!--<navigator url="/packageUser/pages/user/exchange/exchange" >
+      <view class="radish-top__btn">兑换积分</view>
+    </navigator>-->
+    <navigator url="/packageUser/pages/user/integral/checkin/checkin" >
+      <view class="radish-top__btn1">每日签到</view>
+    </navigator>
+  </view>
+  <view class="radish-main">
+    <view class="radish-main__title">交易记录</view>
+    <view class="radish-main__line" wx:key="{{index}}" bindtap="getDetail" data-val="{{item.id}}" wx:for="{{list}}">
+      <view class="radish-main__left">
+        <view class="radish-main__text ellipsis">{{item.source_name}} - {{item.remark}}</view>
+        <view class="radish-main__time"><format-time type="formatTime" value="{{item.ctime}}" ></format-time></view>
+        <view class="clean"></view>
+      </view>
+      <view class="radish-main__count">{{item.count / 100}}积分</view>
+    </view>
+  </view>
+</view>

packageUser/pages/user/integral/integral.wxss

@@ -0,0 +1,93 @@
+.bg {
+  position: relative;
+  width: 100%;
+  min-height: 100%;
+  background-color: #f3f3f3;
+}
+.radish-top {
+  width: 100%;
+  height: 360rpx;
+  background-image: url('http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/pointbg.jpg');
+  background-size: 100%;
+}
+.radish-top__title {
+  padding: 46rpx 0 20rpx;
+  font-size: 28rpx;
+  color: #FFF;
+  text-align: center;
+}
+.radish-top__count {
+  font-size: 60rpx;
+  color: #fff;
+  text-align: center;
+}
+.radish-top__btn {
+  position: absolute;
+  top: 190rpx;
+  left: 150rpx;
+  width: 196rpx;
+  height: 60rpx;
+  border: 2rpx solid #fff;
+  margin: 48rpx auto 0;
+  text-align: center;
+  line-height: 60rpx;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  color: #fff;
+}
+.radish-top__btn1 {
+  position: absolute;
+  top: 190rpx;
+  //right: 150rpx;
+  width: 196rpx;
+  height: 60rpx;
+  border: 2rpx solid #fff;
+  margin: 48rpx auto 0;
+  text-align: center;
+  line-height: 60rpx;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  color: #fff;
+  right:calc(50% - 98rpx)
+}
+.radish-main {
+  background-color: #fff;
+}
+.radish-main__title {
+  height: 50rpx;
+  line-height: 50rpx;
+  color: #bbbbbb;
+  background-color: #f3f3f3;
+  text-align: center;
+  font-size: 24rpx;
+}
+.radish-main__line {
+  margin: 0 20rpx;
+  height: 100rpx;
+  border-bottom: 1rpx solid #eeeeee;
+}
+.radish-main__left {
+  float: left;
+  width: 450rpx;
+}
+.radish-main__text {
+  float: left;
+  padding-top: 16rpx;
+  font-size: 28rpx;
+  color: #4c4c4c;
+  width: 450rpx;
+}
+.radish-main__time {
+  float: left;
+  font-size: 18rpx;
+  color: #bbbbbb;
+  padding-top: 5rpx;
+}
+.radish-main__count {
+  float: right;
+  width: 260rpx;
+  font-size: 28rpx;
+  line-height: 100rpx;
+  text-align: right;
+  color: #eab86a;
+}

packageUser/pages/user/integralDetail/integralDetail.js

@@ -0,0 +1,29 @@
+var _request = require('../../../../utils/request.js')
+var rid
+Page({
+  data: {
+    detail: {}
+  },
+  onLoad: function (options) {
+    rid = options.id
+    this.getRadish()
+  },
+  getRadish () {
+    var that = this
+    var url = 'v1/user/cent/' + rid
+    var params = {
+    }
+    var success = function (res) {
+      var data = res.data
+      that.setData({
+        detail: data
+      })
+    }
+    _request.$get(url, params, success)
+  },
+  onShareAppMessage: function (val) {
+    return _request.share({
+      sc: 'xcx_user_radishdetail'
+    })
+  }
+})

packageUser/pages/user/integralDetail/integralDetail.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "代金券",
+  "usingComponents": {
+    "format-time": "../../../../component/formatTime/formatTime"
+  }
+}

packageUser/pages/user/integralDetail/integralDetail.wxml

@@ -0,0 +1,34 @@
+<view class="bg">
+  <view class="radishDetail">
+    <view class="radishDetail-count">
+      <view class="radishDetail-count__title">数量</view>
+      <view class="radishDetail-count__value">{{detail.count / 100}}积分</view>
+      <view class="clean"></view>
+    </view>
+    <view class="radishDetail-line">
+      <view class="radishDetail-line__title">类型</view>
+      <view class="radishDetail-line__value ellipsis">{{detail.source_name}}</view>
+      <view class="clean"></view>
+    </view>
+    <view class="radishDetail-line">
+      <view class="radishDetail-line__title">时间</view>
+      <view class="radishDetail-line__value ellipsis"><format-time type="formatTime" value="{{detail.c_time}}" ></format-time></view>
+      <view class="clean"></view>
+    </view>
+    <view class="radishDetail-line">
+      <view class="radishDetail-line__title">交易单号</view>
+      <view class="radishDetail-line__value ellipsis">{{detail.relate_id}}</view>
+      <view class="clean"></view>
+    </view>
+<!--     <view class="radishDetail-line">
+      <view class="radishDetail-line__title">剩余积分</view>
+      <view class="radishDetail-line__value ellipsis">此字段接口无返回</view>
+      <view class="clean"></view>
+    </view> -->
+    <view class="radishDetail-line">
+      <view class="radishDetail-line__title">备注</view>
+      <view class="radishDetail-line__value">{{detail.remark}}</view>
+      <view class="clean"></view>
+    </view>
+  </view>
+</view>

packageUser/pages/user/integralDetail/integralDetail.wxss

@@ -0,0 +1,37 @@
+.bg {
+  position: relative;
+  width: 100%;
+  min-height: 100%;
+  background-color: #ffffff;
+}
+.radishDetail {
+  padding: 0 20rpx;
+}
+.radishDetail-count {
+  font-size: 28rpx;
+  line-height: 120rpx;
+  border-bottom: 1rpx solid #eeeeee;
+  margin-bottom: 20rpx;
+}
+.radishDetail-count__title {
+  color: #999999;
+  float: left;
+}
+.radishDetail-count__value {
+  color: #4c4c4c;
+  float: right;
+}
+.radishDetail-line {
+  font-size: 28rpx;
+  line-height: 72rpx;
+}
+.radishDetail-line__title {
+  color: #999999;
+  float: left;
+}
+.radishDetail-line__value {
+  color: #4c4c4c;
+  float: right;
+  width: 540rpx;
+  text-align: right;
+}

pages/areacart/areacart.wxml

@@ -10,7 +10,7 @@
 	    已选中 <text style="color:red">{{cartCount}}</text> 件商品
 	    
 	    <view class="pay-payway-balance fr">
-	    	<text bindtap="delSelected" data-payway="weixinpay">删除选中</text>
+	    	<!--<text bindtap="delSelected" data-payway="weixinpay">删除选中</text>-->
 	    </view>
 	    
 	    <view class="clean"></view>

pages/areacart/areacart.wxss

@@ -465,7 +465,6 @@ word-wrap: break-word;
 -webkit-line-clamp: 2;
 -webkit-box-orient: vertical;
 color:#666;
-white-space:nowrap;
 }
 .cartlist_type{
 color: #999;

pages/centcart/centcart.js

@@ -0,0 +1,404 @@
+var _request = require('../../utils/request.js')
+var _handle = require('../../utils/handle.js')
+var validator = require('../../utils/validator.js')
+Page({
+  data: {
+    orderId: 0,
+    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
+  },
+  handleMovableChange: function(e) {
+    // this.data.currentX = e.detail.x;
+    this.data.currentX = e.detail.x;
+    
+  },
+ 
+  handleTouchend: function(e) {
+    this.isMove = true;
+    let index = e.currentTarget.id;
+    let clist = this.data.cartList;
+//  if (this.data.currentX < -46) {
+////    this.data.x = -92;
+//    clist[index]['movex'] = -100;
+//    this.setData({
+//      cartList: clist
+//    });
+//  } else {
+      clist[index]['movex'] = 0;
+      this.setData({
+        cartList: clist
+      });
+//  }
+  },
+  onLoad: function (options) {
+//	this.getCartList();
+  },
+  onShow: function () {
+  	this.setData({cartList:[]})
+  	this.getCartList();
+  	this.setData({
+  		submitlock: false,
+  		selectedall: false
+  	});
+//	this.getCartListAndSelected();
+  },
+  getCartList:function(){
+  	console.log('getCartList')
+  	var that = this
+    var url = 'v1/products?ptype=cent_sale&&page='+that.data.nowpage+'&&per_page='+that.data.perpage
+    var params = {}
+    var success = function (res) {
+      console.log(res)
+    	if(res.data.list){
+    		for(let i in res.data.list){
+    			res.data.list[i]['movex'] = 0;
+    			res.data.list[i]['IsBuy'] = false;
+    			res.data.list[i]['count'] = 1;
+    		}
+    		that.setData({
+    			cartMore: res.data.list_count > that.data.cartList.length,
+	        cartList: that.data.cartList.concat(res.data.list || []),
+	        cartCount: res.data.count,
+	        cartTotal: res.data.total
+	      })
+    	}else{
+    		wx.showToast({
+	        title: '请先授权登录~',
+	        icon: 'none',
+	        duration: 2000
+	      })
+    	}
+    }
+    _request.$get(url, params, success)
+  },
+  onReachBottom: function () {
+  	console.log('onreachbottom')
+    if (this.data.cartMore) {
+      var page = this.data.nowpage + 1
+      this.setData({
+        nowpage: page
+      })
+      this.getCartList()
+    }
+  },
+  getCartListAndSelected:function(){
+  	console.log('getCartList')
+  	var that = this
+    var url = 'v1/products?ptype=cent_sale&&page=1&&per_page=3'
+    var params = {}
+    var success = function (res) {
+      console.log(res)
+      for(let i in res.data.list){
+      	res.data.list[i]['movex'] = 0;
+    			res.data.list[i]['IsBuy'] = false;
+    			res.data.list[i]['count'] = 1;
+      }
+    	if(res.data.list){
+    		that.setData({
+	        cartList: res.data.list,
+	        cartCount: res.data.count,
+	        cartTotal: res.data.total
+	      })
+//  		that.allSelect();
+    	}else{
+    		wx.showToast({
+	        title: '请先授权登录~',
+	        icon: 'none',
+	        duration: 2000
+	      })
+    	}
+    }
+    _request.$get(url, params, success)
+  },
+  add: function (e) {
+  	console.log('tapadd',e)
+  	var itemid = e.currentTarget.dataset.id;
+  	var itemcount = e.currentTarget.dataset.count;
+  	console.log('itemcount',itemcount)
+    if (itemcount) {
+    	var index = e.currentTarget.dataset.index;
+      var count = itemcount + 1;
+      this.setData({
+	      ['cartList[' + index + '].count']:count 
+	    })
+      this.checkSelected();
+//    this.changeServercount(count,itemid);
+    }
+  },
+  mius: function (e) {
+  	console.log('tapmius',e)
+  	var that = this;
+  	var itemid = e.currentTarget.dataset.id;
+  	var itemcount = e.currentTarget.dataset.count;
+    if (itemcount > 1) {
+      var count = itemcount - 1;
+      var index = e.currentTarget.dataset.index;
+      this.setData({
+	      ['cartList[' + index + '].count']:count 
+	    })
+      this.checkSelected();
+//    this.changeServercount(count,itemid);
+    }/*else{
+    	wx.showModal({
+		  title: '提示',
+		  content: '需要删除改商品吗？',
+		  success: function (sm) {
+		    if (sm.confirm) {
+		        var url = "/v1/cart/mult_delele";
+				    var params = {
+				    	ids:itemid
+				    }
+				    var success = function (res) {
+				      console.log(res)
+				      if(res.data.result){
+				      	
+				      }
+				      that.getCartList();
+				    }
+				    _request.$post(url, params, success);
+		      } else if (sm.cancel) {
+		        console.log('用户点击取消')
+		      }
+		    }
+		  })
+    }*/
+  },
+  delitem:function(e){
+  	var that = this;
+  	var itemid = e.currentTarget.dataset.id;
+  	console.log('itemid',itemid);
+//	wx.showModal({
+//		  title: '提示',
+//		  content: '需要删除改商品吗？',
+//		  success: function (sm) {
+//		    if (sm.confirm) {
+//		        var url = "/v1/cart/mult_delele";
+//				    var params = {
+//				    	ids:itemid
+//				    }
+//				    var success = function (res) {
+//				      console.log(res)
+//				      if(res.data.result){
+//				      	
+//				      }
+//				      that.getCartList();
+//				    }
+//				    _request.$post(url, params, success);
+//		      } else if (sm.cancel) {
+//		        console.log('用户点击取消')
+//		      }
+//		    }
+//		  })
+  },
+  changeCount: function (val) {
+    var count = val.detail.value
+    var itemid = val.target.dataset.id;
+    var index = val.target.dataset.index;
+    if (count <= 0) {
+    	this.setData({
+	      ['cartList[' + index + '].count']:1 
+	    })
+    	this.checkSelected();
+//    this.changeServercount(1,itemid);
+    } /*else if (count > this.data.project.left_count) {
+      this.setData({
+        count: this.data.project.left_count
+      })
+      this.changeCountService(this.data.project.left_count,itemid)
+    }*/ else {
+    	this.setData({
+	      ['cartList[' + index + '].count']:count 
+	    })
+    	this.checkSelected();
+//    this.changeServercount(count,itemid);
+    }
+  },
+  changeServercount:function(val,itemid){
+  	console.log('changeCountService')
+  	var that = this
+    var url = "/v1/cart/change_nums/" + itemid + "/" + val
+    var params = {}
+    var success = function (res) {
+      console.log(res)
+      if(res.result){
+      	//修改成功
+      }
+    }
+    _request.$post(url, params, success);
+    this.getCartList();
+  },
+  itemselected:function(e){
+  	console.log(this)
+  	var nowitems = this.data.selectedItems;
+  	let index = e.currentTarget.dataset.index;
+  	var bool = this.data.cartList[index].IsBuy;
+  	console.log('bool',bool)
+    this.setData({
+      ['cartList[' + index + '].IsBuy']: !bool
+    })
+    
+  	this.checkSelected();
+  },
+  allSelect:function(){
+  	if(this.data.selectedall){
+  		for(var i in this.data.cartList){
+  			this.setData({
+		      ['cartList[' + i + '].IsBuy']: false
+		    })
+  		}
+  		this.setData({
+	      selectedall: false
+	    })
+  	}else{
+  		for(var i in this.data.cartList){
+  			this.setData({
+		      ['cartList[' + i + '].IsBuy']: true
+		    })
+  		}
+  		this.setData({
+	      selectedall: true
+	    })
+  	}
+  	this.checkSelected();
+  },
+  checkSelected:function(){
+  	var cartList = this.data.cartList;
+  	var checkitem = '';
+  	var checkitemnum = '';
+  	var checktotal = 0;
+  	var checkcount = 0;
+//	console.log('cartList',cartList)
+  	for(var i in cartList){
+  		if(cartList[i].IsBuy){
+  			checkitem = checkitem + cartList[i].id+',';
+  			checkitemnum = checkitemnum + cartList[i].count+',';
+  			checktotal = checktotal + (parseFloat(cartList[i].price) * parseInt(cartList[i].count));
+  			checkcount = checkcount + parseInt(cartList[i].count);
+  		}
+  	}
+  	checkitem = checkitem.substr(0,checkitem.length - 1);
+  	checkitemnum = checkitemnum.substr(0,checkitemnum.length - 1);
+  	
+  	
+  	this.setData({
+		  checkeditems:checkitem,
+		  checkeditemsnum:checkitemnum,
+		  cartCount: checkcount,
+    	cartTotal: checktotal
+		})
+//		this.mulChangeState();
+  },
+  mulChangeState:function(){
+  	var that = this;
+  	var itemid = this.data.checkeditems;
+  	var itemnum = this.data.checkeditemsnum;
+  	var url = "v1/cart/mult_change_state";
+    var params = {
+    	ids:itemid,
+    	nums:itemnum
+    }
+    var success = function (res) {
+      console.log('mulChangeState',res)
+      if(res.data.result){
+      	that.getCartList();
+      }
+    }
+    _request.$post(url, params, success);
+    
+  },
+  mulChangeStateToPay:function(){
+  	var that = this;
+  	var lock = this.data.submitlock;
+  	if(!lock){
+  		that.setData({submitlock: true})
+  		var itemid = this.data.checkeditems;
+	  	var itemnum = this.data.checkeditemsnum;
+	  	var url = "v1/cent/order_mul";
+	    var params = {
+	    	ids:itemid,
+	    	nums:itemnum
+	    }
+	    var success = function (res) {
+	    	wx.showToast({
+			    title: '正在跳转到结算页，请稍后~',
+			    icon: 'none',
+			    duration: 2000
+			  })
+	      console.log('mulChangeState',res)
+	      if (res.data.order_id) {
+	        wx.navigateTo({
+	          url: '../pay/pay?orderId=' + res.data.order_id
+	        })
+	      }
+	    }
+	    var err = function(err){
+	    	console.log(err)
+	    	that.setData({submitlock: false})
+	    }
+	    _request.$post(url, params, success, err);
+  	}
+  	
+    
+  },
+  toPay:function(){
+  	
+  	var that = this;
+		var url = "/v1/cent/order_mul";
+    var params = {}
+    var success = function (res) {
+      console.log(res)
+  		if (res.data.order_id) {
+        wx.navigateTo({
+          url: '../pay/pay?orderId=' + res.data.order_id
+        })
+      }
+    }
+    _request.$get(url, params, success);
+  },
+  delSelected:function(){
+  	var that = this;
+  	var itemid = this.data.checkeditems;
+  	if(itemid== ''){
+  		wx.showToast({
+        title: '没有选中任何商品~',
+        icon: 'none',
+        duration: 2000
+      })
+  	}else{
+  		wx.showModal({
+		  title: '提示',
+		  content: '确定要删除选中的商品吗？',
+		  success: function (sm) {
+		    if (sm.confirm) {
+		        var url = "/v1/cart/mult_delele";
+				    var params = {
+				    	ids:itemid
+				    }
+				    var success = function (res) {
+				      console.log(res)
+				      if(res.data.result){
+				      	
+				      }
+				      that.getCartList();
+				    }
+				    _request.$post(url, params, success);
+		      } else if (sm.cancel) {
+		        console.log('用户点击取消')
+		      }
+		    }
+		  })
+  	}
+  }
+})

pages/centcart/centcart.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "专区商品",
+  "usingComponents": {
+    "currency": "../../component/currency/currency"
+  },
+  "backgroundColor": "#f3f3f3"
+}

pages/centcart/centcart.wxml

@@ -0,0 +1,162 @@
+<view class="app app-bg">
+	<view class="pay-payway bgwhile">
+	  <view class="pay-payway-item">
+	  	<!--<view class="fl pay-balance-cash {{selectedall ? 'active' : ''}}" bindtap="allSelect">
+	      <text class="pay-circle" bindtap="selectClick" data-payway="weixinpay">
+	        <text class="pay-select" wx:if="{{curPayway === 'quanxuan'}}"></text>
+	      </text>
+	      <text style="margin-left:5px">全选</text>
+	    </view>-->
+	    已选中 <text style="color:red">{{cartCount}}</text> 件商品
+	    
+	    <view class="pay-payway-balance fr">
+	    	<!--<text bindtap="delSelected" data-payway="weixinpay">删除选中</text>-->
+	    </view>
+	    
+	    <view class="clean"></view>
+	  </view>
+	</view>
+	
+	<view style="height: 85rpx;"></view>
+	<!--购物车列表-->
+	<view class="cartlistbox">
+	<!--
+		<view class="cartlist" wx:for="{{cartList}}" wx:key="id">
+		  <view class="cartlist_item">
+		   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.price}}" data-index="{{index}}">
+		   	  	<text class="pay-circle"></text>
+		   	  </view>
+		      <view class="cartlist_img">
+		        <image src="{{item.cover}}" />
+		      </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>
+		        <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}}">-</button>
+		        	<input type="number" value="{{item.count}}" bindinput="changeCount" data-id='{{item.id}}' data-index="{{index}}"/>
+		        	<button bindtap="add" data-id='{{item.id}}' data-count="{{item.count}}" data-index="{{index}}">+</button>
+		        </view>
+		      </view>
+		      <view class='clear'></view>
+		  </view>
+		</view>
+	-->	
+		<view class="cartlist" wx:for="{{cartList}}" wx:key="id">
+			<view class="main_item">
+		      <movable-area>
+		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend">
+		          <view class="main_item_content ">
+		          		  <view class="cartlist_item">
+						   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.price}}" data-index="{{index}}">
+						   	  	<text class="pay-circle"></text>
+						   	  </view>
+						      <view class="cartlist_img">
+						        <image src="{{item.cover}}" />
+						      </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>
+						        <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>
+						        	<input type="number" value="{{item.count}}" bindinput="changeCount" data-id='{{item.id}}' data-index="{{index}}"/>
+						        	<button bindtap="add" data-id='{{item.id}}' data-count="{{item.count}}" data-index="{{index}}" class="add">+</button>
+						        </view>
+						      </view>
+						      <view class='clear'></view>
+						  </view>
+		          </view>
+		        </movable-view>
+		      </movable-area>
+		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"></view>
+		    </view>
+	    </view>
+	</view>
+
+	<view style="height:50px"></view>
+  <view class="pay-footer">
+    <view class="pay-footer-bar"> 
+      <view class="pay-footer-item">
+        <!-- <currency wx:if="{{useRadishSelect && payData.total_price - balanceInfo.total > 0}}" symbol="￥" value="{{payData.total_price - balanceInfo.total}}" class="red"></currency>
+        <currency wx:if="{{!useRadishSelect}}" symbol="￥" value="{{payData.total_price}}" class="red"></currency>
+        <currency wx:if="{{useRadishSelect && payData.total_price - balanceInfo.total <= 0}}" symbol="￥" value="0" class="red"></currency> -->
+        
+        <view class="fl pay-balance-cash {{selectedall ? 'active' : ''}}" bindtap="allSelect">
+	      <text class="pay-circle" bindtap="selectClick" data-payway="weixinpay">
+	        <text class="pay-select" wx:if="{{curPayway === 'quanxuan'}}"></text>
+	      </text>
+	      <text style="margin-left:5px">全选</text>
+	    </view>
+	    
+        <!--<currency symbol="￥" value="{{cartTotal}}" class="red"></currency>-->
+        
+        <!-- 
+        <text class="red" wx:if="{{curPayway === 'balance'}}">{{project.robo_balance_price * payData.count}}积分</text>
+        <text class="red" wx:if="{{curPayway === 'integral'}}">{{project.mall_balance_price * payData.count}}积分</text> -->
+        <view style="float: right;padding-right: 10px;">
+      	<!--共 <text class="red">{{cartCount}}</text> 件商品-->
+      	
+      	应付：<currency symbol="￥" value="{{cartTotal}}" class="red"></currency>
+      	</view>
+      </view>
+      
+      <form bindsubmit="mulChangeStateToPay" report-submit="{{true}}" class="pay-footer-item2">
+      <button formType="submit" class="pay-footer-botton">
+        去结算
+      </button>
+      </form>
+    </view>
+  </view>
+</view>
+
+<view wx:if="{{pwdDialog}}">
+  <view class="pay-panel">
+    <view class="pay-panel-title">立即支付</view>
+    <view>
+      <input type="password" bindinput="inputPwd" placeholder="请输入交易密码" class="pay-panel-input" />
+    </view>
+    <view class="pay-panel-footer">
+      <text class="pay-panel-cancel" bindtap="cancelDialog">取消</text>
+      <text class="pay-panel-confirm" bindtap="pay">确定</text>
+    </view>
+  </view>
+  <view class="pay-dialog"></view>
+</view>
+
+<!-- 弹框 -->
+<view class="modal-mask" bindtap="hideModal" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
+<view class="modal-dialog" wx:if="{{showModal}}">
+  <view class="modal-content1">
+    <view>
+      <image wx:if="{{curPayway === 'balance'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/icon/luobo.png" style="width:120rpx;height:120rpx;margin:0 auto;display:block;"></image>
+      <image wx:if="{{curPayway === 'integral'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/d5cpay.jpg" style="width:120rpx;height:120rpx;margin:0 auto;display:block;border-radius: 50%;"></image>
+    </view>
+    <view class="modal-span">还差<text class="modal-count">{{luoboCount}}</text><text wx:if="{{curPayway === 'balance'}}">积分</text><text wx:if="{{curPayway === 'integral'}}">积分</text></view>
+    <view class="modal-span1">您可通过如下操作<text wx:if="{{curPayway === 'balance'}}">完成兑换</text></view>
+  </view>
+  <view class="modal-footer1">
+    <view class="btn-confirm" bindtap="onConfirm" data-status="confirm" wx:if="{{curPayway === 'balance'}}">前往积分兑换积分</view>
+    <view class="btn-confirm" bindtap="onConfirm1" data-status="confirm" wx:if="{{curPayway === 'balance'}}">购买积分( {{countMoney}} )元</view>
+    <view class="btn-confirm" bindtap="onConfirm2" data-status="confirm" wx:if="{{curPayway === 'integral'}}">获取更多第五创积分</view>
+    <view class="btn-cancel" bindtap="onCancel" data-status="cancel">取消</view>
+  </view>
+</view>
+
+<!--
+<view class="modal-mask" bindtap="hideModal" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
+<view class="modal-dialog" wx:if="{{showModal}}">
+  <view class="modal-title">积分不足</view>
+  <view class="modal-content">
+    <view>
+      <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/icon/luobo.png" style="width:215rpx;height:215rpx;margin:0 auto;display:block;"></image>
+    </view>
+    <view class="modal-span">立即前往汇兑页获取积分</view>
+  </view>
+  <view class="modal-footer">
+    <view class="btn-cancel" bindtap="onCancel" data-status="cancel">取消</view>
+    <view class="btn-confirm" bindtap="onConfirm" data-status="confirm">前往兑换</view>
+  </view>
+</view>
+-->

pages/centcart/centcart.wxss

@@ -0,0 +1,563 @@
+.pay-address {
+  position: relative;
+  width: 100%;
+  background-color: #fff;
+  padding: 30rpx 20rpx 15rpx;
+  box-sizing: border-box;
+}
+.pay-arrowR {
+  position: absolute;
+  top: 50rpx;
+  right: 10rpx;
+  width: 35rpx;
+  height: 35rpx;
+  display: block;
+}
+.pay-font {
+  width: 660rpx;
+  line-height: 30rpx;
+  font-size: 28rpx;
+  color: #4c4c4c;
+  margin-bottom: 24rpx;
+}
+.pay-border {
+  width: 100%;
+  height: 2rpx;
+  display: block;
+  margin-bottom: 15rpx;
+}
+.pay-project {
+  width: 100%;
+  background-color: #fff;
+  padding: 20rpx;
+  box-sizing: border-box;
+}
+.pay-project-content {
+  position: relative;
+  width: 100%;
+  background-color: #fcfcfc;
+}
+.pay-project-img {
+  display: block;
+  width: 200rpx;
+  height: 200rpx;
+  float: left;
+}
+.pay-project-info {
+  float: left;
+  width: 480rpx;
+  font-size: 24rpx;
+  margin-left: 20rpx;
+  margin-top: 12rpx;
+}
+.pay-project-title {
+  /*display: block;*/
+  /*height: 60rpx;*/
+  -webkit-line-clamp: 2;
+}
+.pay-project-spec {
+  display: block;
+  color: #bbb;
+  line-height: 36rpx;
+  margin-top: 16rpx;
+}
+.pay-project-price {
+  display: block;
+  color: #eab86a;
+  margin-top: 25rpx;
+}
+.pay-project-price .pay-gray {
+  color: #bbb;
+}
+.pay-count {
+  margin-top: 40rpx;
+  margin-bottom: 20rpx;
+}
+.pay-count-word {
+  display: block;
+  height: 66rpx;
+  line-height: 66rpx;
+  float: left;
+  font-size: 28rpx;
+  color: #4c4c4c;
+}
+.pay-count-select {
+  float: right;
+  height: 66rpx;
+}
+.pay-count-select button {
+  width: 60rpx;
+  height: 66rpx;
+  color: #999;
+  font-size: 28rpx;
+  text-align: center;
+  padding: 0;
+  display: inline-block;
+}
+.pay-count-select button:first-child {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.pay-count-select button:last-child {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.pay-count-select button:after {
+  border-radius: 0;
+}
+.pay-count-select input {
+  width: 154rpx;
+  height: 66rpx;
+  background-color: #ddd;
+  color: #4c4c4c;
+  font-size: 28rpx;
+  text-align: center;
+  display: inline-block;
+}
+.pay-title {
+  display: block;
+  width: 100%;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 24rpx;
+  color: #bbb;
+  text-align: center;
+  border-bottom: 1rpx solid #ddd;
+}
+.pay-module {
+  width: 100%;
+  background-color: #fff;
+  margin-top: 20rpx;
+}
+.pay-integral {
+  margin-top: 30rpx;
+  margin-bottom: 30rpx;
+}
+.pay-integral-info {
+  width: 646rpx;
+  font-size: 28rpx;
+  color: #4c4c4c;
+  margin-left: 20rpx;
+}
+.pay-integral .block {
+  display: block;
+}
+.pay-integral .red {
+  color: #eab86a;
+}
+.pay-integral .gray {
+  color: #bbb;
+}
+.pay-checked {
+  margin-right: 20rpx;
+  margin-top: 30rpx;
+}
+.pay-mb {
+  margin-bottom: 18rpx;
+}
+.pay-icon {
+  width: 60rpx;
+  height: 60rpx;
+  vertical-align: middle;
+  display: inline-block;
+  margin-right: 20rpx;
+}
+.pay-payway {
+  width: 100%;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  font-size: 28rpx;
+  color: #4c4c4c;
+  position: fixed;
+	top: 0;
+	z-index: 99;
+	  
+}
+.pay-payway-item {
+  width: 100%;
+  height: 100rpx;
+  line-height: 100rpx;
+  border-bottom: 1rpx solid #f3f3f3;
+}
+.pay-balance-cash {
+  color: #bbb;
+}
+.pay-circle {
+  position: relative;
+  width: 44rpx;
+  height: 44rpx;
+  background-color: #eee;
+  display: inline-block;
+  border-radius: 50%;
+  vertical-align: middle;
+}
+.pay-select {
+  position: absolute;
+  top: 7rpx;
+  left: 7rpx;
+  width: 30rpx;
+  height: 30rpx;
+  background-color: #eab86a;
+  display: inline-block;
+  border-radius: 50%;
+}
+.pay-footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 99;
+}
+.pay-footer-bar {
+  width: 100%;
+  height: 88rpx;
+  line-height: 44rpx;
+}
+.pay-footer-item {
+  float: left;
+  display: block;
+  width: 65%;
+  height: 88rpx;
+  line-height: 88rpx;
+  background-color: #fff;
+  color: #bbbbbb;
+  font-size: 28rpx;
+  padding-left: 20rpx;
+  box-sizing: border-box;
+  border-top: 1rpx solid #f3f3f3;
+}
+.pay-footer-item .red {
+  color: #eab86a;
+  font-size: 40rpx;
+  
+}
+.pay-payway-item:last-child {
+  border-bottom: none;
+}
+.pay-footer-item2 {
+  float: right;
+  display: block;
+  width: 35%;
+  height: 88rpx;
+  line-height: 88rpx;
+
+}
+.pay-footer-botton {
+  display: block;
+  width: 100%;
+  height: 100%;
+  line-height: 88rpx;
+  background-color: #eab86a;
+  color: #fff;
+  font-size: 28rpx;
+  text-align: center;
+}
+.pay-mt {
+  margin-bottom: 108rpx; 
+}
+.pay-address-add {
+  text-align: center;
+  font-size: 28rpx;
+  color: #999;
+  line-height: 90rpx;
+}
+.product-count {
+  color: #4c4c4c;
+  margin-top:25rpx; 
+}
+.product-info {
+  position: absolute;
+  bottom: 10rpx;
+  width: 490rpx;
+}
+.pay-dialog {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0,0,0,0.4);
+  z-index: 99;
+}
+.pay-panel {
+  position: fixed;
+  left: 50%;
+  top: 20%;
+  width: 580rpx;
+  margin-left: -290rpx;
+  background-color: #fff;
+  z-index: 100;
+}
+.pay-panel-title {
+  font-size: 32rpx;
+  color: #4c4c4c;
+  text-align: center;
+  margin-top: 48rpx;
+}
+.pay-panel-input {
+  width: 500rpx;
+  height: 100rpx;
+  background-color: #f7f7f7;
+  border: 1px solid #cccccc;
+  font-size: 28rpx;
+  color: #bbb;
+  margin: 60rpx auto 40rpx;
+  display: block;
+  text-align: center;
+}
+.pay-panel-footer {
+  width: 100%;
+  height: 100rpx;
+  border-top: 1rpx solid #dddddd;
+}
+.pay-panel-footer text {
+  display: inline-block;
+  width: 50%;
+  height: 100rpx;
+  text-align: center;
+  font-size: 28rpx;
+  box-sizing: border-box;
+  line-height: 100rpx;
+}
+.pay-panel-cancel {
+  border-right: 1rpx solid #dddddd;
+  color: #4c4c4c;
+}
+.pay-panel-confirm {
+  color: #eab86a;
+}
+.modal-mask {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.3;
+  overflow: hidden;
+  z-index: 9000;
+  color: #fff;
+}
+.modal-dialog {
+  width: 540rpx;
+  overflow: hidden;
+  position: fixed;
+  top: 35%;
+  left: 0;
+  z-index: 9999;
+  background: #f9f9f9;
+  margin: -180rpx 105rpx;
+  border-radius: 4rpx;
+}
+.modal-title {
+  padding-top: 30rpx;
+  font-size: 24rpx;
+  color: #535353;
+  text-align: center;
+}
+.modal-content {
+  padding: 50rpx 32rpx;
+}
+.modal-content1 {
+  padding: 30rpx 32rpx 40rpx;
+}
+.modal-span{
+  text-align: center;
+  width: 100%;
+  margin-top: 40rpx;
+  /* margin-bottom: 10rpx; */
+  margin-bottom: 28rpx; 
+  /* font-size: 24rpx; */
+  font-size: 33rpx;
+  color: #4c4c4c;
+}
+.modal-span1{
+  text-align: center;
+  width: 100%;
+  /* margin-top: 40rpx; */
+  /* font-size: 24rpx; */
+  font-size: 33rpx;
+  color: #4c4c4c;
+}
+.modal-count{
+  color: #eab86a;
+}
+.modal-footer {
+  display: flex;
+  flex-direction: row;
+  height: 86rpx;
+  border-top: 1rpx solid #dedede;
+  font-size: 34rpx;
+  line-height: 86rpx;
+}
+.modal-footer1 {
+  /* display: flex;
+  flex-direction: row; */
+  /* height: 86rpx; */
+  border-top: 1rpx solid #dedede;
+  font-size: 34rpx;
+  /* line-height: 86rpx; */
+}
+.btn-cancel {
+  width: 100%;
+  color: #666;
+  text-align: center;
+  /* border-right: 1px solid #dedede; */
+  font-size: 28rpx;
+  height: 86rpx;
+  line-height: 86rpx;
+}
+.btn-confirm {
+  width: 100%;
+  color: #eab86a;
+  text-align: center;
+  font-size: 28rpx;
+  height: 86rpx;
+  line-height: 86rpx;
+  border-bottom: 1rpx solid #dedede;
+}
+
+
+.bgwhile{
+	background-color:#FFFFFF;
+}
+
+
+.cartlist{}
+.cartlist_item{
+background-color: #FFFFFF;
+padding: 15rpx;
+}
+.cartlist_select{
+width: 35rpx;
+display: inline;
+}
+.cartlist_select.active .pay-circle,.pay-balance-cash.active .pay-circle{
+background-color: #eab86a;
+border: 5rpx solid #eee;
+width: 39rpx;
+height: 39rpx;
+
+}
+
+.cartlist_img{
+width: 180rpx;
+display: inline-block;
+height: 180rpx;
+vertical-align: middle;
+margin-left: 15rpx;
+margin-right: 15rpx;
+}
+.cartlist_img image{
+width: 100%;
+height: 100%;
+}
+.cartlist_info{
+display: inline-block;
+vertical-align: middle;
+width:calc(100% - 320rpx)
+}
+.cartlist_title{
+font-size: 30rpx;
+overflow: hidden;
+text-overflow: ellipsis;
+display: -webkit-box;
+word-wrap: break-word;
+-webkit-line-clamp: 2;
+-webkit-box-orient: vertical;
+color:#666;
+}
+.cartlist_type{
+color: #999;
+margin: 5px 0;
+font-size:12px;
+}
+.cartlist_price{
+float: left;
+color: #F00;
+font-size: 35rpx;
+margin-top: 7rpx;
+}
+.cartlist_num{float: right;}
+.cartlist_num button{
+width: 50rpx;
+height: 50rpx;
+line-height: 40rpx;
+text-align: center;
+display: inline-block;
+border: 1px solid #ddd;
+border-radius: 50%;
+}
+.cartlist_num button.mius{
+border:1px solid #eab86a;
+color:#eab86a;
+}
+.cartlist_num button.add{
+
+background: #eab86a;
+color: #FFF;
+border: 0;
+line-height: 45rpx;
+
+
+}
+.cartlist_num input{
+width: 50rpx;
+height: 40rpx;
+
+text-align: center;
+display: inline-block;
+border-left: 0;
+border-right: 0;
+font-size: 40rpx;
+
+margin: 0 10rpx;
+
+}
+
+.cartlistbox{
+	padding:15rpx;
+}
+
+
+
+.main {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+ 
+.main_item {
+  display: flex;
+  flex-direction: row;
+  overflow: hidden;
+  margin-top: 10px;
+  border-radius:10px;
+  
+}
+ 
+movable-area {
+  width: 100%;
+  height: 210rpx;
+  background: #fff;
+}
+ 
+movable-view {
+  width: calc(100% + 184rpx);
+  height: 210rpx;
+}
+ 
+.main_item_content {
+
+}
+ 
+.delete_btn {
+  width: 184rpx;
+  height: 210rpx;
+  background-color: #f2f4f6;
+  border-top-right-radius: 10px;
+  border-bottom-right-radius: 10px;
+  color: #fff;
+  font-size: 28rpx;
+  text-align: center;
+  line-height: 210rpx;
+}

pages/customservice/customservice.wxml

@@ -3,8 +3,8 @@
     <image src="{{qr}}" class="erweima"/>
     <view class="text1">我是您的专属客服</view>
     <view class="text2">任何疑问 , 专属客服妹纸等你来撩！</view>
-    <!--<view class="btn" bindtap="downLoad">保存二维码</view>-->
-    <button class="btn" open-type="contact">点我立即咨询</button>
+    <view class="btn" bindtap="downLoad">保存二维码</view>
+    <!--<button class="btn" open-type="contact">点我立即咨询</button>-->
   </view>
   <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/customer/bg_kf2.png" class="other-img1"/>
   <view class="popup-bg" wx:if="{{popup}}">

pages/home/home.js

@@ -491,6 +491,11 @@ Page ({
   	}
     
   },
+  tocentcart () {
+  		wx.navigateTo({
+	      url: '/pages/centcart/centcart'
+	   })
+  },
   topyq () {
     wx.navigateTo({
       url: '/packageUser/pages/user/invite/material/material'

pages/home/home.wxml

@@ -25,6 +25,11 @@
           <view class="item-name">{{item.name}}</view>
         </view>
       </view>
+      <view bindtap="tocentcart">
+        <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/about.png" class="item-index" />
+        <view class="item-name">积分专区</view>
+      </view>
+      
       <view bindtap="todz">
       	<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/shop_apply.png" class="item-index"  wx:if="{{userinfo.rank < 2}}"/>
         <view class="item-name" wx:if="{{userinfo.rank < 2}}">申请店长</view>
@@ -36,6 +41,7 @@
         <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/about.png" class="item-index" />
         <view class="item-name">关于商城</view>
       </view>
+      
       <view bindtap="topyq">
         <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/pyq.png" class="item-index" />
         <view class="item-name">发圈素材</view>

pages/pay/pay.js

@@ -9,6 +9,7 @@ Page({
     address: null,
     selectaddress:false,
     balanceInfo: {},
+    centInfo:{},
     userInfo: {},
     radish: 0,
     pwd: '',
@@ -21,7 +22,8 @@ Page({
     curPayway: 'weixinpay',
     payway: {
       weixin: 'weixinpay',
-      balance: 'balance'
+      balance: 'balance',
+      cent: 'cent'
     },
     total:0,
     yunfei:0,
@@ -93,7 +95,12 @@ Page({
       });
       
       
-      that.getBalanceInfo();
+      if(that.data.payData.order_type == 3){
+      	that.getCentInfo();
+      }else{
+      	that.getBalanceInfo();
+      }
+      
     }
     __request.$get(url, params, success)
   },
@@ -128,6 +135,23 @@ Page({
     }
     __request.$get(url, params, success)
   },
+  getCentInfo: function () {
+    var that = this
+    var url = "v1/user/cent/info";
+    var params = {}
+    
+    var success = function (val) {
+//  	console.log('showusebalance:',(val.data.total > 0 && that.data.payData.order_type == 0))
+      that.setData({
+        centInfo: val.data,
+        cache: false,
+				curPayway:'cent',
+				useBalance:false,
+				afterdec:parseInt(val.data.total) >= parseInt(that.data.total) + parseInt(that.data.yunfei)?'0':(that.data.total + that.data.yunfei)-val.data.total
+      });
+    }
+    __request.$get(url, params, success)
+  },
   switchChange:function(e){
   	var that = this;
   	that.setData({
@@ -200,20 +224,20 @@ Page({
         } else {
           that.pay()
         }
-      } else if (that.data.curPayway === 'integral') {
-        var b
-        if (that.data.project) {
-          b = that.data.balanceInfo.dc_total - that.data.project.mall_balance_price * that.data.payData.count
-        }
-        if (b < 0) {
-          this.setData({
-            luoboCount: that.data.project.mall_balance_price * that.data.payData.count - that.data.balanceInfo.dc_total,
-            showModal: true,
-            payFlag: false
-          })
-        } else {
+      } else if (that.data.curPayway === 'cent') {
+//      var b
+//      if (that.data.project) {
+//        b = that.data.balanceInfo.dc_total - that.data.project.mall_balance_price * that.data.payData.count
+//      }
+//      if (b < 0) {
+//        this.setData({
+//          luoboCount: that.data.project.mall_balance_price * that.data.payData.count - that.data.balanceInfo.dc_total,
+//          showModal: true,
+//          payFlag: false
+//        })
+//      } else {
           that.pay()
-        }
+//      }
       } else if (that.data.curPayway === 'weixinpay') {
       	if(that.data.useBalance && that.data.afterdec > 0){
       		wx.showModal({
@@ -299,6 +323,8 @@ Page({
       s: 'xcx',
       use_coupon:that.data.useBalance
     }
+    
+    console.log('onpay',params)
     var success = function (val) {
     	console.log(val);
     	if(val.statusCode === 200){

pages/pay/pay.wxml

@@ -79,7 +79,7 @@
     <text class="pay-title">支付方式</text>
     <view class="pay-payway">
 
-      <view class="pay-payway-item" bindtap="selectClick" data-payway="weixinpay">
+      <view class="pay-payway-item" bindtap="selectClick" data-payway="weixinpay" wx:if="{{payData.order_type != 3}}">
         <view class="pay-payway-balance fl">
           <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/wxpay.jpg" bindtap="selectClick" data-payway="weixinpay"></image>
           <text bindtap="selectClick" data-payway="weixinpay">微信支付</text>
@@ -91,7 +91,6 @@
         </view>
         <view class="clean"></view>
       </view>
-		  
 <!--
       <view class="pay-payway-item" wx:if="{{balanceInfo.total && !payData.product.robo_balance_price}}">
         <view class="pay-payway-balance fl">
@@ -113,6 +112,18 @@
           <switch checked bindchange="switchChange" color="#eab86a" style="zoom:0.75"/>
         </view>
 	</view>
+	
+	<view class="pay-payway-item" wx:if="{{payData.order_type == 3}}">
+		<view class="pay-payway-balance fl">
+          <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png" bindtap="selectClick" data-payway="balance"></image>
+          <text bindtap="selectClick" data-payway="balance">积分支付 （剩余：{{centInfo.total / 100}}）</text>
+        </view>
+        <view class="fr pay-balance-cash" bindtap="selectClick" data-payway="weixinpay">
+          <text class="pay-circle" data-payway="cent">
+            <text class="pay-select"></text>
+          </text>
+        </view>
+	</view>
 <!--
       <view class="pay-payway-item" wx:if="{{payData.order_type == 0 && balanceInfo.total}}" bindtap="selectClick" data-payway="balance">
         <view class="pay-payway-balance fl">
@@ -187,12 +198,17 @@
         <currency wx:if="{{!useRadishSelect}}" symbol="￥" value="{{payData.total_price}}" class="red"></currency>
         <currency wx:if="{{useRadishSelect && payData.total_price - balanceInfo.total <= 0}}" symbol="￥" value="0" class="red"></currency> -->
         
+        <view  wx:if="{{curPayway === 'cent'}}" style="display: inline;">
+        	<text class="red">{{(total+yunfei) / 100}}积分</text>
+        </view>
+        <view wx:else style="display: inline;">
+        	<currency wx:if="{{useBalance}}" symbol="￥" value="{{afterdec}}" class="red"></currency>
+	        <currency wx:else symbol="￥" value="{{payData.pay_way == '' ? total+yunfei : payData.paied_price}}" class="red"></currency>
+	        
+	        <text class="red" wx:if="{{curPayway === 'balance'}}">{{(total+yunfei) / 100}}<currency value="{{total}}" class="red"></currency>代金券</text>
+	        <text class="red" wx:if="{{curPayway === 'integral'}}">{{(total+yunfei) / 100}}代金券</text>
+        </view>
         
-        <currency wx:if="{{useBalance}}" symbol="￥" value="{{afterdec}}" class="red"></currency>
-        <currency wx:else symbol="￥" value="{{payData.pay_way == '' ? total+yunfei : payData.paied_price}}" class="red"></currency>
-        
-        <text class="red" wx:if="{{curPayway === 'balance'}}">{{(total+yunfei) / 100}}<currency value="{{total}}" class="red"></currency>代金券</text>
-        <text class="red" wx:if="{{curPayway === 'integral'}}">{{(total+yunfei) / 100}}代金券</text>
       </view>
       <form bindsubmit="toPay" report-submit="{{true}}" class="pay-footer-item2">
       <button formType="submit" class="pay-footer-botton" disabled="{{payFlag}}">

pages/user/all/all.js

@@ -12,6 +12,7 @@ Page({
   data: {
     userInfo: {},
     balance: 0,
+    integral:0,
     bindTel: false,
     checkData: {},
     merchant: {},
@@ -45,6 +46,7 @@ Page({
     this.info();
     if (this.data.bindTel) {
       this.getBalanceInfo()
+      this.getIntegralInfo()
       if (that.data.checkData.merchant_id > 0) {
         that.getmerchant()
       }
@@ -217,6 +219,7 @@ Page({
             bindTel: true
           })
           that.getBalanceInfo()
+          that.getIntegralInfo()
           that.info()
         }
       }
@@ -271,6 +274,19 @@ Page({
     }
     _request.$get(url, params, success)
   },
+  getIntegralInfo () {
+    var that = this
+    var url = 'v1/user/cent/info'
+    var params = {
+    }
+    var success = function (res) {
+      var result = res.data.total
+      that.setData({
+        integral: result
+      })
+    }
+    _request.$get(url, params, success)
+  },
   toInviteList () {
     wx.navigateTo({
       url: '/packageUser/pages/user/invite/invite'
@@ -316,6 +332,11 @@ Page({
       url: '/packageUser/pages/user/radish/radish'
     })
   },
+  toIntegral () {
+    wx.navigateTo({
+      url: '/packageUser/pages/user/integral/integral'
+    })
+  },
   toSafe () {
     wx.navigateTo({
       url: '/packageUser/pages/user/safe/safe'

pages/user/all/all.wxml

@@ -29,6 +29,11 @@
   </view>
   <view style="padding-bottom: 50rpx;">
     <view class="user-radishbg">
+      <view class="user-points" bindtap="toIntegral">
+        <view class="user-points__title">我的积分</view>
+        <image class="user-points__right" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
+        <view class="user-points__num">{{integral / 100}}</view>
+      </view>
       <view class="user-points" bindtap="toRadish">
         <view class="user-points__title">我的代金券</view>
         <image class="user-points__right" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>

project.config.json

@@ -1,371 +1,374 @@
 {
-	"description": "项目配置文件。",
-	"setting": {
-		"urlCheck": true,
-		"es6": true,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false,
-		"compileHotReLoad": false,
-		"useIsolateContext": true
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.0.7",
-	"appid": "wx84f6c33a9fa3977d",
-	"projectname": "l_xcx",
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": 50,
-			"list": [
-				{
-					"id": 0,
-					"name": "绑定手机",
-					"pathName": "pages/user/bind/bind",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "绑定手机成功",
-					"pathName": "pages/user/bindsuccess/bindsuccess",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "个人中心",
-					"pathName": "pages/user/all/all",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "地址管理列表",
-					"pathName": "pages/user/address/address",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "新增地址",
-					"pathName": "pages/user/newAddress/newAddress",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "团长申请",
-					"pathName": "pages/user/applyLeader/applyLeader",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "代金券列表",
-					"pathName": "pages/user/radish/radish",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "代金券详情",
-					"pathName": "pages/user/radishDetail/radishDetail",
-					"query": "id=7"
-				},
-				{
-					"id": 7,
-					"name": "项目列表",
-					"pathName": "pages/projects/projects",
-					"query": ""
-				},
-				{
-					"id": 8,
-					"name": "订单详情",
-					"pathName": "pages/start/start",
-					"query": "url=pages/user/order/order&oid=EX12312412314123"
-				},
-				{
-					"id": 9,
-					"name": "订单列表",
-					"pathName": "pages/user/orders/orders",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "兑换代金券",
-					"pathName": "pages/user/exchange/exchange",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "修改交易密码",
-					"pathName": "pages/user/safe/safe",
-					"query": ""
-				},
-				{
-					"id": 12,
-					"name": "项目详情",
-					"pathName": "pages/projects/project-detail/project-detail",
-					"query": "id=16",
-					"scene": "1001"
-				},
-				{
-					"id": 8,
-					"name": "汇兑页",
-					"pathName": "pages/user/exchange/exchange",
-					"query": "",
-					"scene": "1001"
-				},
-				{
-					"id": 14,
-					"name": "支付页面",
-					"pathName": "pages/pay/pay",
-					"query": "orderId=EX20180727CD2B718E",
-					"scene": "1001"
-				},
-				{
-					"id": -1,
-					"name": "测试",
-					"pathName": "pages/user/ceshi/ceshi",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "汇兑成功",
-					"pathName": "pages/user/exchangeSuccess/exchangeSuccess",
-					"query": ""
-				},
-				{
-					"id": 17,
-					"name": "订单列表（商家）",
-					"pathName": "pages/merchant/orders/orders",
-					"query": "id=6"
-				},
-				{
-					"id": 18,
-					"name": "订单详情（商家）",
-					"pathName": "pages/merchant/order/order",
-					"query": "id=EX20180517610512B7"
-				},
-				{
-					"id": 19,
-					"name": "填写物流（商家）",
-					"pathName": "pages/merchant/logistics/logistics",
-					"query": "id=EX20180517610512B7"
-				},
-				{
-					"id": -1,
-					"name": "红包",
-					"pathName": "pages/activity/redpacket/redpacket",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "我的粮仓",
-					"pathName": "pages/user/granary/granary",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "我的收成",
-					"pathName": "pages/user/granary/use/use",
-					"query": "order_id=1"
-				},
-				{
-					"id": -1,
-					"name": "收益统计",
-					"pathName": "pages/user/fund/fund",
-					"query": ""
-				},
-				{
-					"id": 21,
-					"name": "生成工具",
-					"pathName": "pages/activity/screen/screen",
-					"query": ""
-				},
-				{
-					"id": 22,
-					"name": "渠道模拟",
-					"pathName": "pages/start/start",
-					"query": "scene=pages/activity/redpacket/redpacket@7"
-				},
-				{
-					"id": 23,
-					"name": "二维码渠道模拟",
-					"pathName": "pages/start/start",
-					"query": "scene=35"
-				},
-				{
-					"id": 24,
-					"name": "分享模板模拟",
-					"pathName": "pages/start/start",
-					"query": "url=pages/activity/redpacket/redpacket&rid=3&invite_id=2"
-				},
-				{
-					"id": -1,
-					"name": "我的推广",
-					"pathName": "pages/user/invite/invite",
-					"query": ""
-				},
-				{
-					"id": 28,
-					"name": "我的推广",
-					"pathName": "pages/start/start",
-					"query": "scene=invite_wx_24"
-				},
-				{
-					"id": -1,
-					"name": "我的k客服",
-					"pathName": "pages/customservice/customservice",
-					"query": ""
-				},
-				{
-					"id": 30,
-					"name": "我的k客服",
-					"pathName": "pages/start/start",
-					"query": "url=pages/projects/project-detail/project-detail&id=18&invite=2"
-				},
-				{
-					"id": 32,
-					"name": "大米",
-					"pathName": "pages/start/start",
-					"query": "url=pages/helpfarm/helpfarm-detail/helpfarm-detail&id=31&invite=9"
-				},
-				{
-					"id": -1,
-					"name": "订单详情",
-					"pathName": "pages/projects/project-detail/project-detail",
-					"query": "id=108"
-				},
-				{
-					"id": 33,
-					"name": "代销评估",
-					"pathName": "pages/helpfarm/count/count",
-					"query": "price=600000&count=100&min=7&retrieve=0.1&sell=87.5&limit=50"
-				},
-				{
-					"id": 34,
-					"name": "代销评估",
-					"pathName": "pages/start/start",
-					"query": "url=pages/helpfarm/helpfarm-detail/helpfarm-detail&id=1"
-				},
-				{
-					"id": -1,
-					"name": "分享测试",
-					"pathName": "pages/start/start",
-					"query": "invite=104"
-				},
-				{
-					"id": -1,
-					"name": "1",
-					"pathName": "pages/user/invite/invite",
-					"query": ""
-				},
-				{
-					"id": 38,
-					"name": "销售榜单",
-					"pathName": "pages/user/invite/rank/rank",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "销售榜单",
-					"pathName": "pages/start/start",
-					"query": "url=pages/user/invite/rank/rank&year=2018&month=9&invite=2"
-				},
-				{
-					"id": -1,
-					"name": "bug",
-					"pathName": "pages/user/order/order",
-					"query": "id=EX201809191799CBB4"
-				},
-				{
-					"id": -1,
-					"name": "bug",
-					"pathName": "pages/merchant/order/order",
-					"query": "id=EX2018100922CA4B35"
-				},
-				{
-					"id": -1,
-					"name": "销售榜单",
-					"pathName": "pages/user/withdraw/withdraw",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "销售榜单",
-					"pathName": "pages/start/start",
-					"query": "url=pages/projects/projects"
-				},
-				{
-					"id": 44,
-					"name": "海报",
-					"pathName": "pages/helpfarm/helpfarm-detail/helpfarm-detail",
-					"query": "id=34"
-				},
-				{
-					"id": 45,
-					"name": "海报",
-					"pathName": "pages/start/start",
-					"query": "scene=poster$1$2"
-				},
-				{
-					"id": 46,
-					"name": "海报",
-					"pathName": "pages/projects/project-detail/project-detail",
-					"query": "id=28"
-				},
-				{
-					"id": -1,
-					"name": "海报商品",
-					"pathName": "pages/projects/project-detail/project-detail",
-					"query": "id=44"
-				},
-				{
-					"id": 48,
-					"name": "海报商品",
-					"pathName": "pages/start/start",
-					"query": "scene=project$44$2"
-				},
-				{
-					"id": 49,
-					"name": "海报商品",
-					"pathName": "pages/helpfarm/helpfarm-detail/helpfarm-detail",
-					"query": "id=8"
-				},
-				{
-					"id": 50,
-					"name": "1",
-					"pathName": "pages/start/start",
-					"query": "url=packageUser/pages/user/order/order&id=EX201801246CFCDFD8"
-				}
-			]
-		}
-	}
+  "description": "项目配置文件。",
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": false,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": false,
+    "useApiHook": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "useCompilerModule": false,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.0.7",
+  "appid": "wx84f6c33a9fa3977d",
+  "projectname": "l_xcx",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "id": 0,
+          "name": "绑定手机",
+          "pathName": "pages/user/bind/bind",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "绑定手机成功",
+          "pathName": "pages/user/bindsuccess/bindsuccess",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "个人中心",
+          "pathName": "pages/user/all/all",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "地址管理列表",
+          "pathName": "pages/user/address/address",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "新增地址",
+          "pathName": "pages/user/newAddress/newAddress",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "团长申请",
+          "pathName": "pages/user/applyLeader/applyLeader",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "代金券列表",
+          "pathName": "pages/user/radish/radish",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "代金券详情",
+          "pathName": "pages/user/radishDetail/radishDetail",
+          "query": "id=7"
+        },
+        {
+          "id": 7,
+          "name": "项目列表",
+          "pathName": "pages/projects/projects",
+          "query": ""
+        },
+        {
+          "id": 8,
+          "name": "订单详情",
+          "pathName": "pages/start/start",
+          "query": "url=pages/user/order/order&oid=EX12312412314123"
+        },
+        {
+          "id": 9,
+          "name": "订单列表",
+          "pathName": "pages/user/orders/orders",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "兑换代金券",
+          "pathName": "pages/user/exchange/exchange",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "修改交易密码",
+          "pathName": "pages/user/safe/safe",
+          "query": ""
+        },
+        {
+          "id": 12,
+          "name": "项目详情",
+          "pathName": "pages/projects/project-detail/project-detail",
+          "query": "id=16",
+          "scene": "1001"
+        },
+        {
+          "id": 8,
+          "name": "汇兑页",
+          "pathName": "pages/user/exchange/exchange",
+          "query": "",
+          "scene": "1001"
+        },
+        {
+          "id": 14,
+          "name": "支付页面",
+          "pathName": "pages/pay/pay",
+          "query": "orderId=EX20180727CD2B718E",
+          "scene": "1001"
+        },
+        {
+          "id": -1,
+          "name": "测试",
+          "pathName": "pages/user/ceshi/ceshi",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "汇兑成功",
+          "pathName": "pages/user/exchangeSuccess/exchangeSuccess",
+          "query": ""
+        },
+        {
+          "id": 17,
+          "name": "订单列表（商家）",
+          "pathName": "pages/merchant/orders/orders",
+          "query": "id=6"
+        },
+        {
+          "id": 18,
+          "name": "订单详情（商家）",
+          "pathName": "pages/merchant/order/order",
+          "query": "id=EX20180517610512B7"
+        },
+        {
+          "id": 19,
+          "name": "填写物流（商家）",
+          "pathName": "pages/merchant/logistics/logistics",
+          "query": "id=EX20180517610512B7"
+        },
+        {
+          "id": -1,
+          "name": "红包",
+          "pathName": "pages/activity/redpacket/redpacket",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的粮仓",
+          "pathName": "pages/user/granary/granary",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的收成",
+          "pathName": "pages/user/granary/use/use",
+          "query": "order_id=1"
+        },
+        {
+          "id": -1,
+          "name": "收益统计",
+          "pathName": "pages/user/fund/fund",
+          "query": ""
+        },
+        {
+          "id": 21,
+          "name": "生成工具",
+          "pathName": "pages/activity/screen/screen",
+          "query": ""
+        },
+        {
+          "id": 22,
+          "name": "渠道模拟",
+          "pathName": "pages/start/start",
+          "query": "scene=pages/activity/redpacket/redpacket@7"
+        },
+        {
+          "id": 23,
+          "name": "二维码渠道模拟",
+          "pathName": "pages/start/start",
+          "query": "scene=35"
+        },
+        {
+          "id": 24,
+          "name": "分享模板模拟",
+          "pathName": "pages/start/start",
+          "query": "url=pages/activity/redpacket/redpacket&rid=3&invite_id=2"
+        },
+        {
+          "id": -1,
+          "name": "我的推广",
+          "pathName": "pages/user/invite/invite",
+          "query": ""
+        },
+        {
+          "id": 28,
+          "name": "我的推广",
+          "pathName": "pages/start/start",
+          "query": "scene=invite_wx_24"
+        },
+        {
+          "id": -1,
+          "name": "我的k客服",
+          "pathName": "pages/customservice/customservice",
+          "query": ""
+        },
+        {
+          "id": 30,
+          "name": "我的k客服",
+          "pathName": "pages/start/start",
+          "query": "url=pages/projects/project-detail/project-detail&id=18&invite=2"
+        },
+        {
+          "id": 32,
+          "name": "大米",
+          "pathName": "pages/start/start",
+          "query": "url=pages/helpfarm/helpfarm-detail/helpfarm-detail&id=31&invite=9"
+        },
+        {
+          "id": -1,
+          "name": "订单详情",
+          "pathName": "pages/projects/project-detail/project-detail",
+          "query": "id=108"
+        },
+        {
+          "id": 33,
+          "name": "代销评估",
+          "pathName": "pages/helpfarm/count/count",
+          "query": "price=600000&count=100&min=7&retrieve=0.1&sell=87.5&limit=50"
+        },
+        {
+          "id": 34,
+          "name": "代销评估",
+          "pathName": "pages/start/start",
+          "query": "url=pages/helpfarm/helpfarm-detail/helpfarm-detail&id=1"
+        },
+        {
+          "id": -1,
+          "name": "分享测试",
+          "pathName": "pages/start/start",
+          "query": "invite=104"
+        },
+        {
+          "id": -1,
+          "name": "1",
+          "pathName": "pages/user/invite/invite",
+          "query": ""
+        },
+        {
+          "id": 38,
+          "name": "销售榜单",
+          "pathName": "pages/user/invite/rank/rank",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "销售榜单",
+          "pathName": "pages/start/start",
+          "query": "url=pages/user/invite/rank/rank&year=2018&month=9&invite=2"
+        },
+        {
+          "id": -1,
+          "name": "bug",
+          "pathName": "pages/user/order/order",
+          "query": "id=EX201809191799CBB4"
+        },
+        {
+          "id": -1,
+          "name": "bug",
+          "pathName": "pages/merchant/order/order",
+          "query": "id=EX2018100922CA4B35"
+        },
+        {
+          "id": -1,
+          "name": "销售榜单",
+          "pathName": "pages/user/withdraw/withdraw",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "销售榜单",
+          "pathName": "pages/start/start",
+          "query": "url=pages/projects/projects"
+        },
+        {
+          "id": 44,
+          "name": "海报",
+          "pathName": "pages/helpfarm/helpfarm-detail/helpfarm-detail",
+          "query": "id=34"
+        },
+        {
+          "id": 45,
+          "name": "海报",
+          "pathName": "pages/start/start",
+          "query": "scene=poster$1$2"
+        },
+        {
+          "id": 46,
+          "name": "海报",
+          "pathName": "pages/projects/project-detail/project-detail",
+          "query": "id=28"
+        },
+        {
+          "id": -1,
+          "name": "海报商品",
+          "pathName": "pages/projects/project-detail/project-detail",
+          "query": "id=44"
+        },
+        {
+          "id": 48,
+          "name": "海报商品",
+          "pathName": "pages/start/start",
+          "query": "scene=project$44$2"
+        },
+        {
+          "id": 49,
+          "name": "海报商品",
+          "pathName": "pages/helpfarm/helpfarm-detail/helpfarm-detail",
+          "query": "id=8"
+        },
+        {
+          "id": 50,
+          "name": "1",
+          "pathName": "pages/start/start",
+          "query": "url=packageUser/pages/user/order/order&id=EX201801246CFCDFD8"
+        }
+      ]
+    }
+  }
 }