内容更新

app.json

@@ -48,6 +48,8 @@
         "pages/user/integral/checkin/checkin",
         "pages/user/radish/radish",
         "pages/user/radishDetail/radishDetail",
+		"pages/user/silver/silver",
+		"pages/user/silverDetail/silverDetail",
         "pages/user/orders/orders",
         "pages/user/order/order",
         "pages/user/comment/comment",
@@ -126,12 +128,6 @@
         "text": "购物车"
       },
       {
-        "iconPath": "images/footer/weixin.png",
-        "selectedIconPath": "images/footer/weixinc.png",
-        "pagePath": "pages/customservice/customservice",
-        "text": "客服"
-      },
-      {
         "iconPath": "images/footer/my.png",
         "selectedIconPath": "images/footer/myc.png",
         "pagePath": "pages/user/all/all",

packageUser/pages/user/order/order.js

@@ -115,5 +115,21 @@ Page({
     return _request.share({
       sc: 'xcx_user_order'
     })
-  }
+  },
+  copy:function(e){
+      var code = e.currentTarget.dataset.copy;
+      wx.setClipboardData({
+        data: code,
+        success: function (res) {
+          wx.showToast({
+            title: '已复制订单号',
+          });
+        },
+        fail:function(res){
+          wx.showToast({
+            title: '复制失败',
+          });
+        }
+      })
+    }
 })

packageUser/pages/user/order/order.wxml

@@ -130,6 +130,12 @@
     <view class="orderDetail-btn__red" bindtap="confirmPopup" wx:if="{{order.status === 'dispatch'}}">确认收货</view>
     <view class="orderDetail-btn__black" bindtap="CancelPopup" wx:if="{{order.status === 'unpay'}}">取消订单</view>
 	
+	<button class="orderDetail-btn__wxkf" open-type="contact"
+	bindtap ='copy' data-copy='{{order.order_id}}'
+	>
+		联系客服
+	</button>
+	
 	<view wx:if="{{order.sign && order.express_order_no && order.express_code}}" class="orderDetail-btn__black">
 		<navigator url="/packageUser/pages/user/logistics/logistics?id={{order.order_id}}" open-type="navigate">查看物流 </navigator>
 	</view>

packageUser/pages/user/order/order.wxss

@@ -182,6 +182,21 @@
   margin-top: 14rpx;
   float: right;
 }
+.orderDetail-btn__wxkf {
+width: 158rpx;
+    height: 58rpx;
+    border: 1rpx solid #41b03b;
+    font-size: 28rpx;
+    color: #4c4c4c;
+    text-align: center;
+    line-height: 58rpx;
+    border-radius: 45px;
+    margin-right: 20rpx;
+    margin-top: 14rpx;
+    float: right;
+    background: #41b03b;
+    color: #FFF;
+}
 .orderDetail-express {
   background-color: #fff;
   margin: 20rpx 0;

packageUser/pages/user/silver/silver.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/balance/info'
+    var params = {
+    }
+    var success = function (res) {
+      var result = res.data.silver_total
+      that.setData({
+        balance: result
+      })
+    }
+    _request.$get(url, params, success)
+  },
+  getBalanceList () {
+    var that = this
+    var url = 'v1/user/silvers'
+    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/silverDetail/silverDetail?id=' + id
+    })
+  },
+  onShareAppMessage: function (val) {
+    return _request.share({
+      sc: 'xcx_user_silver'
+    })
+  }
+})

packageUser/pages/user/silver/silver.json

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

packageUser/pages/user/silver/silver.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/buy/buy" >
+      <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/silver/silver.wxss

@@ -0,0 +1,95 @@
+.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/djquan.jpg');
+  background-size: 100%;
+}
+.radish-top__title {
+    padding: 95rpx 0 0;
+    font-size: 34rpx;
+    color: #FFF;
+    text-align: center;
+    text-shadow: 1px 1px 1px #bb954d;
+}
+.radish-top__count {
+    font-size: 70rpx;
+    color: #fff;
+    text-align: center;
+    text-shadow: 1px 1px 1px #e6231d;
+}
+.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: 210rpx;
+    width: 206rpx;
+    height: 60rpx;
+    border: 2rpx solid #eb4d20;
+    margin: 48rpx auto 0;
+    text-align: center;
+    line-height: 60rpx;
+    border-radius: 45px;
+    font-size: 32rpx;
+    color: #fff;
+    right: calc(50% - 103rpx);
+    background: linear-gradient(to right,#eb712c,#e71f1c);
+}
+.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/silverDetail/silverDetail.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/silver/' + 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_silverdetail'
+    })
+  }
+})

packageUser/pages/user/silverDetail/silverDetail.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "银豆",
+  "usingComponents": {
+    "format-time": "../../../../component/formatTime/formatTime"
+  }
+}

packageUser/pages/user/silverDetail/silverDetail.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.ctime}}" ></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/silverDetail/silverDetail.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/cart/cart.wxml

@@ -60,7 +60,8 @@
 						        <image src="{{item.cover}}" />
 						      </view>
 						      <view class="cartlist_info">
-						        <view class="cartlist_title"><i wx:if="{{item.pv < item.original_price}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{item.product_name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
+						        <!-- <view class="cartlist_title"><i wx:if="{{item.pv < item.original_price}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{item.product_name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view> -->
+						        <view class="cartlist_title"><i wx:if="{{item.use_quan == false}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{item.product_name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
 						        
 								<view class="project-pack-list" wx:if="{{item.package}}">
 									<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">

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" session-from="sessionFrom">点我立即咨询</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.wxml

@@ -383,7 +383,7 @@
         <view wx:if="{{!item.video_state}}" bindtap="toProject" data-val="{{item.id}}">
 			<view class="project-pack" wx:if="{{item.package}}">
 				<view class="project-left-pack">
-					<view class="project-title ellipsisLn" style="height: 48rpx;">
+					<view class="project-title ellipsisLn" style="min-height: 48rpx;max-height:102">
 						<i wx:if="{{item.pv < item.price}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>
 						{{item.name}}
 					</view>
@@ -396,10 +396,10 @@
 					</view>
 					<image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha"/>
 					
-					<view class="project-price" style="padding-top:10rpx;font-size: 35rpx;"><currency symbol="￥" value="{{item.price}}" />
+					<view class="project-price" style="padding-top:0;font-size: 35rpx;"><currency symbol="￥" value="{{item.price}}" />
 						<view class="project-price" style="padding-top:20rpx;color: #999;text-decoration: line-through;font-size: 23rpx;display: inline;padding-left: 10rpx;"><currency symbol="￥" value="{{item.user_sale_price}}" /></view>
 						
-						<view class="project-count" style="float: right;padding-top: 10rpx;font-size: 23rpx;">已售{{item.sold_count}}件</view>
+						<view class="project-count" style="float: right;padding-top: 0rpx;font-size: 23rpx;">已售{{item.sold_count}}件</view>
 					</view>
 					<view class="clear"></view>
 				</view>

pages/home/home.wxss

@@ -210,7 +210,7 @@
 }
 .project-pack-list{
 	    background: #f7f7f7;
-	    font-size: 24rpx;
+	    font-size: 21rpx;
 	    padding: 15rpx;
 	    line-height: 36rpx;
 	    color: #666;
@@ -984,7 +984,7 @@
    height: 28rpx;
    display: inline-block;
    float: left;
-   padding-top: 95rpx;
+   padding-top: 10rpx;
    padding-right: 10rpx;
    font-size: 20rpx;
  }

pages/pay/pay.js

@@ -41,6 +41,8 @@ Page({
 	repickdepartsList:[],
 	pickindex:0,
 	pickid:0,
+	has_unuse_quan:false,
+	use_silver:0
   },
   onLoad: function (options) {
     this.data.orderId = options.orderId;
@@ -101,6 +103,7 @@ Page({
     var that = this
     var url = "v1/order/" + that.data.orderId;
     var params = {}
+	var check_has_unuse_quan = false;
     var success = function (val) {
       if (val.data && val.data.product && !val.data.product.robo_balance_price) {
         that.setData({
@@ -109,24 +112,34 @@ Page({
       }
       
       var total = 0;
-  		for(var i in val.data.product_list){
-      	total = total + (val.data.product_list[i].price * val.data.product_list[i].count)
-      }
+		for(var i in val.data.product_list){
+			if(!val.data.product_list[i].send) total = total + (val.data.product_list[i].price * val.data.product_list[i].count)
+		}
 	  
 	  var canusebalance = 0;
 	  var nousebalance = 0;
+	  var use_silver = 0;
 	  for(var i in val.data.product_list){
 		  var item = val.data.product_list[i];
-		  if(val.data.special_promotion){//新增双十一促销判断
-			  canusebalance = canusebalance + (item.price * item.count);
-		  }else{
-			 if(item.pv >= item.price){
-			 			   canusebalance = canusebalance + (item.price * item.count);
-			 }else{
-			 			  nousebalance = nousebalance + (item.price * item.count);
-			 } 
+		  if(!item.send){
+			  if(val.data.special_promotion){//新增双十一促销判断
+			  			  canusebalance = canusebalance + (item.price * item.count);
+			  }else{
+			  			 // if(item.pv >= item.price){
+			  			 // 			   canusebalance = canusebalance + (item.price * item.count);
+			  			 // }else{
+			  			 // 			  nousebalance = nousebalance + (item.price * item.count);
+			  			 // } 
+						 if(!item.use_quan){
+			  			 			nousebalance = nousebalance + (item.price * item.count);   
+									check_has_unuse_quan = true;
+			  			 }else{
+			  			 			canusebalance = canusebalance + (item.price * item.count);
+			  			 } 
+			  }
+			  
+			  use_silver = use_silver + item.silver;
 		  }
-		  
 	  }
 	  
 	  console.log('canusebalance',canusebalance);
@@ -139,7 +152,10 @@ Page({
         yunfei:that.data.receivetype == 0 ? total<9900?val.data.freight:0 : 0,
 		_yunfei:total<9900?val.data.freight:0,
 		canusebalance:canusebalance,
-		nousebalance:nousebalance
+		nousebalance:nousebalance,
+		has_unuse_quan:check_has_unuse_quan,
+		use_silver:use_silver,
+		disAmount:val.data.dis_amount
       });
       
       
@@ -204,38 +220,143 @@ Page({
     
     var success = function (val) {
 //  	console.log('showusebalance:',(val.data.total > 0 && that.data.payData.order_type == 0))
-
+		
+		//获取订单最高可用银豆
+		var max_silver = that.data.payData.total_silver;
+		//获取账户持有银豆
+		// var user_silver = val.data.silver_total;
+		// var use_silver = 0;//使用银豆
+		// if(user_silver > 0){
+		// 	use_silver = user_silver >= max_silver ? max_silver : user_silver;
+		// }
+		//新直接使用计算好的值
+		var use_silver = that.data.use_silver;
+		
+		
+		//总额和canuse&nouse减去银豆
+		var has_balance = val.data.total;
+		var sour_total = that.data.total;
+		var mins_total = that.data.total - use_silver;
+		var mins_canuse = that.data.canusebalance;
+		var mins_nouse = that.data.nousebalance;
+		var left_silver = use_silver;
 		var afterdec = 0;
+		var dis_amount = 0;
+		
+		
+		//
+		sour_total = sour_total - use_silver;
+		//canuse的扣除银豆
+		if(mins_canuse - use_silver < 0){
+			mins_canuse = 0;
+			left_silver = use_silver - mins_canuse;
+		}else{
+			mins_canuse = mins_canuse - use_silver;
+			left_silver = 0;
+		}
+		console.log('mins_canuse',mins_canuse);
+		console.log('left_silver',left_silver);
+		//nouse的扣除剩余的银豆
+		if(mins_nouse - left_silver < 0){
+			mins_nouse = 0;
+			left_silver = left_silver - mins_nouse;
+		}else{
+			mins_nouse = mins_nouse - left_silver;
+			left_silver = 0;
+		}
+		console.log('left_silver',left_silver);
+		
+		
+		//新增剩余的根据等级和订单类型做折扣
+		// if(val.data.show_invite_mode == 1 && that.data.payData.order_type == 0){//店长可以享受优惠
+		// 	var disbi = val.data.discount_bl == 0? 100 : val.data.discount_bl;
+		// 	sour_total = sour_total * (disbi/100);
+		// 	dis_amount = parseInt(mins_total - (mins_total * (disbi/100)));
+		// 	mins_canuse = mins_canuse * (disbi/100);
+		// 	mins_nouse = mins_nouse * (disbi/100);
+		// }
+		
+		
+		
+		
+		//新已减银豆
 		if(that.data.payData.pay_way == ''){
 			if(that.data.receivetype == 0){
-				console.log('val.data.total',val.data.total);
-				console.log('that.data.canusebalance',that.data.canusebalance);
-				console.log('that.data.yunfei',that.data.yunfei);
-				if(parseInt(val.data.total) >= parseInt(that.data.canusebalance) + parseInt(that.data.yunfei)){
-					afterdec = that.data.nousebalance;
+				if(parseInt(has_balance) >= parseInt(mins_canuse) + parseInt(that.data.yunfei)){
+					console.log('1');
+					afterdec = mins_nouse;
 				}else{
-					afterdec = Math.abs((that.data.canusebalance + that.data.yunfei)-val.data.total) + that.data.nousebalance;
+					console.log('2');
+					afterdec = Math.abs((mins_canuse + that.data.yunfei)-has_balance) + mins_nouse;
 				}
 			}else{
-				if(parseInt(val.data.total) >= parseInt(that.data.canusebalance)){
-					afterdec = that.data.nousebalance;
+				if(parseInt(has_balance) >= parseInt(mins_canuse)){
+					console.log('3');
+					afterdec = mins_nouse;
 				}else{
-					afterdec = Math.abs((that.data.canusebalance)-val.data.total) + that.data.nousebalance;
+					console.log('4');
+					afterdec = Math.abs((mins_canuse)-has_balance) + mins_nouse;
 				}
 			}
+			
 		}else{
-			afterdec = that.data.total+that.data.yunfei-that.data.payData.coupon_price;
+			console.log('5');
+			// afterdec = (that.data.total - that.data.payData.paied_silver - that.data.payData.dis_amount)+that.data.yunfei-that.data.payData.coupon_price;
+			afterdec = that.data.total + that.data.yunfei - that.data.payData.paied_silver - that.data.payData.coupon_price -that.data.payData.dis_amount;
 		}
+
+		var source_afterdec = afterdec;
+
+		
+		
+		//canuse的扣除银豆
+		// mins_canuse = mins_canuse - use_silver < 0 ? 0 : mins_canuse - use_silver;
+		// left_silver = mins_canuse - use_silver < 0 ? use_silver - mins_canuse : 0;
+		// //nouse的扣除剩余的银豆
+		// mins_nouse = mins_nouse - left_silver < 0 ? 0 : mins_nouse - left_silver;
+		// left_silver = mins_nouse - left_silver < 0 ? left_silver - mins_nouse : 0;
 		
+		console.log('afterdec',afterdec);
+		console.log('mins_canuse',mins_canuse);
+		console.log('mins_nouse',mins_nouse);
+		console.log('left_silver',left_silver);
+		console.log('sour_total',sour_total);
 
+		//旧未减银豆
+		// if(that.data.payData.pay_way == ''){
+		// 	if(that.data.receivetype == 0){
+		// 		if(parseInt(val.data.total) >= parseInt(that.data.canusebalance) + parseInt(that.data.yunfei)){
+		// 			afterdec = that.data.nousebalance;
+		// 		}else{
+		// 			afterdec = Math.abs((that.data.canusebalance + that.data.yunfei)-val.data.total) + that.data.nousebalance;
+		// 		}
+		// 	}else{
+		// 		if(parseInt(val.data.total) >= parseInt(that.data.canusebalance)){
+		// 			afterdec = that.data.nousebalance;
+		// 		}else{
+		// 			afterdec = Math.abs((that.data.canusebalance)-val.data.total) + that.data.nousebalance;
+		// 		}
+		// 	}
+		// }else{
+		// 	afterdec = that.data.total+that.data.yunfei-that.data.payData.coupon_price;
+		// }
+		
+	
+	
       that.setData({
         balanceInfo: val.data,
         cache: false,
 //      curPayway:val.data.total >= (that.data.total + that.data.yunfei)?'balance':'weixinpay'
-				curPayway:'weixinpay',
-				// useBalance:(val.data.total > 0 && that.data.payData.order_type == 0 && that.data.payData.pv >= that.data.payData.total_price)? true:false,
-				useBalance:(val.data.total > 0 && that.data.payData.order_type == 0) || !val.data.payData.shut_wechat ? true:false,
-				afterdec: afterdec
+		curPayway:'weixinpay',
+		// useBalance:(val.data.total > 0 && that.data.payData.order_type == 0 && that.data.payData.pv >= that.data.payData.total_price)? true:false,
+		useBalance: /* (val.data.total > 0 && that.data.payData.order_type == 0) || */ !that.data.payData.shut_wechat ? true:false,
+		afterdec: afterdec,
+		hasSeilver: val.data.silver_total,
+		useSeilver: use_silver - left_silver,
+		minusTotal: sour_total,
+		discountBl: val.data.discount_bl,
+		sourceAfterdec: source_afterdec,
+		// disAmount:dis_amount
       });
     }
     __request.$get(url, params, success)
@@ -577,6 +698,7 @@ Page({
     var url = "v1/pick_departs";
     var params = {}
     var success = function (val) {
+		console.log('pick_departs-val',val);
 		let list = [];
 		for(var i in val.data){
 			list.push(val.data[i]['pick_address']+'-'+val.data[i]['pick_title'])
@@ -585,7 +707,7 @@ Page({
 			pickdepartsList:val.data,
 			repickdepartsList:list,
 			pickindex: 0,
-			pickid:val.data[0]['id']
+			pickid:val.data[0]?val.data[0]['id']:0
 		})
     }
     __request.$get(url, params, success)

pages/pay/pay.wxml

@@ -54,7 +54,9 @@
       <image class="pay-project-img" src="{{item.cover}}"></image>
       <view class="pay-project-info">
         <text class="pay-project-title ellipsisLn">{{item.product_name}}</text>
-		 <p wx:if="{{!payData.special_promotion && payData.pv < payData.total_price && item.pv < item.price}}" style="color:#F00">[该商品无法使用提货券兑换]</p>
+		 <!-- <p wx:if="{{!payData.special_promotion && payData.pv < payData.total_price && item.pv < item.price}}" style="color:#F00">[该商品无法使用提货券兑换]</p> -->
+		 <p wx:if="{{!payData.special_promotion && !item.use_quan}}" style="color:#F00">[该商品无法使用提货券兑换]</p>
+		 <p wx:if="{{item.send}}" style="color:#F00">[赠品]</p>
 		<view class="project-pack-list" wx:if="{{item.package}}">
 			<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">
 				<p>{{pack.item_title}} x{{pack.nums}}</p>
@@ -141,15 +143,28 @@
       </view>
 -->
 	
+	<view class="pay-payway-item" wx:if="{{payData.pay_way == '' && hasSeilver > 0}}">
+		<view class="pay-payway-balance fl">
+	      <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/yindou.png"></image>
+	      <text >银豆抵扣 （剩余：{{hasSeilver / 100}}）</text>
+	    </view>
+	    <view class="fr pay-balance-cash">
+	      <text class="pay-circle">
+	        <text class="pay-select"></text>
+	      </text>
+	    </view>
+	</view>
 	
-	
-	<view class="pay-payway-item" wx:if="{{payData.order_type == 0 && balanceInfo.total && payData.pay_way == ''}}">
+	<view class="pay-payway-item" wx:if="{{balanceInfo.total > 0 && payData.pay_way == ''}}">
 		<view class="pay-payway-balance fl">
-          <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/luobopay.jpg" bindtap="selectClick" data-payway="balance"></image>
-          <text bindtap="selectClick" data-payway="balance">提货券抵扣 （剩余：{{balanceInfo.total / 100}}）</text>
+          <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/luobopay.jpg"></image>
+          <text >提货券抵扣 （剩余：{{balanceInfo.total / 100}}）</text>
         </view>
         <view class="fr pay-balance-cash" wx:if="{{!payData.shut_wechat}}">
-          <switch checked bindchange="switchChange" color="#eab86a" style="zoom:0.75"/>
+			<text class="pay-circle">
+			  <text class="pay-select"></text>
+			</text>
+          <!-- <switch checked bindchange="switchChange" color="#eab86a" style="zoom:0.75"/> -->
         </view>
 		<view class="fr pay-balance-cash" wx:else>
 		  <text class="pay-circle">
@@ -158,7 +173,8 @@
 		</view>
 	</view>
 	
-	<view class="pay-payway-item" wx:if="{{payData.order_type == 0 && balanceInfo.total && payData.pay_way == '' && payData.pv < payData.total_price}}">
+	<!-- <view class="pay-payway-item" wx:if="{{balanceInfo.total && payData.pay_way == '' && payData.pv < payData.total_price}}"> -->
+	<view class="pay-payway-item" wx:if="{{balanceInfo.total && payData.pay_way == '' && has_unuse_quan}}">
 		<view class="pay-payway-balance fr">
 	      <text bindtap="selectClick" data-payway="balance" >订单中存在不能使用提货券兑换的商品</text>
 	    </view>
@@ -232,12 +248,26 @@
 		订单已满99元以上(含99元)免除运费
 	  </view>
 	  
-	  <view wx:if="{{useBalance || payData.coupon_price>0}}" style="padding:15rpx;text-align:right">
+	  <view style="padding:15rpx;text-align:right">
 	  	订单总金额 <text style="color:#F00">{{receivetype == 0 ? ((payData.total_price + payData.freight) / 100) : (payData.total_price / 100)}}</text>
 	  </view>
 	  
+	  <view wx:if="{{payData.pay_way == ''}}" style="padding:15rpx;text-align:right">
+	  	使用银豆抵扣 <text style="color:#F00">-{{useSeilver / 100}}</text>
+	  </view>
+	  <view wx:if="{{payData.pay_way != ''}}" style="padding:15rpx;text-align:right">
+	  	使用银豆抵扣 <text style="color:#F00">-{{payData.paied_silver / 100}}</text>
+	  </view>
+	  
+	  
+	  <view wx:if="{{disAmount > 0 || payData.dis_amount > 0}}" style="padding:15rpx;text-align:right">
+	  	店长折扣优惠金额 
+		<text style="color:#F00" wx:if="{{payData.dis_amount}}">-{{payData.dis_amount / 100}}</text>
+		<text style="color:#F00" wx:else>-{{disAmount / 100}}</text>
+	  </view>
+	  
 	  <view wx:if="{{useBalance && payData.pay_way == ''}}" style="padding:15rpx;text-align:right">
-	  	使用提货券抵扣 <text style="color:#F00">-{{payData.coupon_price>0?payData.coupon_price/100:((total+yunfei)-afterdec) / 100}}</text> 提货券
+	  	使用提货券抵扣 <text style="color:#F00">-{{payData.coupon_price>0?payData.coupon_price/100:((minusTotal+yunfei)-afterdec) / 100}}</text> 提货券
 	  </view>
 	  <view wx:if="{{payData.pay_way != ''}}" style="padding:15rpx;text-align:right">
 	  	使用提货券抵扣 <text style="color:#F00">-{{payData.coupon_price}}</text> 提货券
@@ -262,15 +292,15 @@
         <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>
+        	<text class="red">{{(minusTotal+yunfei) / 100}}积分</text>
         </view>
         <view wx:else style="display: inline;">
-        	<currency wx:if="{{useBalance}}" symbol="￥" value="{{afterdec}}" class="red"></currency>
+        	<currency wx:if="{{useBalance}}" symbol="￥" value="{{afterdec - payData.dis_amount}}" class="red"></currency>
 	        <!-- <currency wx:else symbol="￥" value="{{payData.pay_way == '' ? total+yunfei : payData.paied_price}}" class="red"></currency> -->
-	        <currency wx:else symbol="￥" value="{{payData.pay_way == '' ? total+yunfei : total+yunfei-payData.coupon_price}}" class="red"></currency>
+	        <currency wx:else symbol="￥" value="{{payData.pay_way == '' ? minusTotal+yunfei : minusTotal+yunfei-payData.coupon_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>
+	        <text class="red" wx:if="{{curPayway === 'balance'}}">{{(minusTotal+yunfei) / 100}}<currency value="{{minusTotal}}" class="red"></currency>提货券</text>
+	        <text class="red" wx:if="{{curPayway === 'integral'}}">{{(minusTotal+yunfei) / 100}}提货券</text>
         </view>
         
       </view>

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

@@ -5,6 +5,15 @@
 		<view class="sharetips-txt">请点击右上角选择分享到朋友圈</view>
 	</view>
 	<view class="toolBox">
+		<button class="toolBox-item" open-type="contact"
+		send-message-title="{{project.name}}"
+		send-message-path="{{'/pages/projects/project-detail/project-detail?id=' + project.id}}"
+		send-message-img="{{project.cover}}"
+		show-message-card="{{true}}"
+		>
+		  <image src="../../../images/footer/kf.png" ></image>
+		</button>
+		
 		<button open-type="share" class="toolBox-item" wx:if="{{readOnly != 1}}">
 			<image src="../../../images/footer/wx.png" />
 		</button>
@@ -172,6 +181,7 @@
         <image src="../../../images/footer/poster.png" class="p-footer-icon"></image>
         <text class="p-footer-text">分享</text>
       </view>
+	  
       <!-- <view class="detail-footer-item" style="flex: 0.5;">
         <image src="../../../images/footer/shoppingcart.png" class="detail-footer-icon"></image>
         <text class="detail-footer-text">购物车</text>

pages/projects/project-detail/project-detail.wxss

@@ -699,7 +699,7 @@ width: 14rpx;
 	    right: 15rpx;
 }
 .toolBox-item{
-background: rgba(255,255,255,0.75);
+background: rgba(255,255,255,1);
 	    margin-bottom: 15rpx;
 	    border-radius: 50%;
 	    text-align: center;

pages/user/all/all.js

@@ -13,6 +13,7 @@ Page({
     userInfo: {},
     balance: 0,
     integral:0,
+	silver:0,
     bindTel: false,
     checkData: {},
     merchant: {},
@@ -51,7 +52,7 @@ Page({
 	// that.checkLogin();
     this.info();
 	that.getBalanceInfo()
-	that.getIntegralInfo()
+	// that.getIntegralInfo()
     // if (this.data.bindTel) {
     //   this.getBalanceInfo()
     //   this.getIntegralInfo()
@@ -96,7 +97,7 @@ Page({
 							})
 							that.info()
 							that.getBalanceInfo()
-							that.getIntegralInfo()
+							// that.getIntegralInfo()
 							
 							// if (that.data.checkData.merchant_id > 0) {
 							//   that.getmerchant()
@@ -338,7 +339,7 @@ Page({
           //   bindTel: true
           // })
           that.getBalanceInfo()
-          that.getIntegralInfo()
+          // that.getIntegralInfo()
           that.info()
         }
       }
@@ -388,12 +389,13 @@ Page({
     var success = function (res) {
       var result = res.data.total
       that.setData({
-        balance: result
+        balance: result,
+		silver: res.data.silver_total
       })
     }
     _request.$get(url, params, success)
   },
-  getIntegralInfo () {
+  getSilverInfo () {
     var that = this
     var url = 'v1/user/cent/info'
     var params = {
@@ -503,6 +505,11 @@ Page({
       url: '/packageUser/pages/user/integral/integral'
     })
   },
+  toSilver () {
+    wx.navigateTo({
+      url: '/packageUser/pages/user/silver/silver'
+    })
+  },
   toSafe () {
     wx.navigateTo({
       url: '/packageUser/pages/user/safe/safe'

pages/user/all/all.wxml

@@ -31,11 +31,16 @@
   </view>
   <view style="padding-bottom: 50rpx;">
     <view class="user-radishbg">
-      <view class="user-points" bindtap="toIntegral">
+		<view class="user-points" bindtap="toSilver">
+		  <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">{{silver / 100}}</view>
+		</view>
+      <!-- <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> -->
       <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>
@@ -162,10 +167,14 @@
         <view class="user-line__title">我的代理</view>
         <image class="user-line__right" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view> -->
-      <view class="user-line" bindtap="toCustom" >
+     <!-- <view class="user-line" bindtap="toCustom" >
         <view class="user-line__title">联系客服</view>
         <image class="user-line__right" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
-      </view>
+      </view> -->
+	  <button class="user-line" open-type="contact" >
+        <view class="user-line__title">联系客服</view>
+        <image class="user-line__right" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
+      </button>
 	  
       <!--
       <view class="user-line" bindtap="toAbout" style="border:0;">

project.config.json

@@ -1,5 +1,5 @@
 {
-  "description": "项目配置文件。",
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "setting": {
     "urlCheck": true,
     "es6": true,
@@ -34,345 +34,290 @@
     "disableUseStrict": false,
     "showES6CompileOption": false,
     "useCompilerPlugins": false,
-    "minifyWXML": true
+    "minifyWXML": true,
+    "useStaticServer": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.0.7",
+  "libVersion": "2.13.2",
   "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"
         }
       ]
     }
+  },
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

utils/request.js

@@ -1,7 +1,7 @@
 // 新正式（未审批）
-const apiHost = 'https://fohowapi.hiwavo.com/' 
+// const apiHost = 'https://fohowapi.hiwavo.com/' 
 // 测试
-// const apiHost = 'https://tfohowapi.hiwavo.com/'
+const apiHost = 'https://tfohowapi.hiwavo.com/'
 
 
 function $get (url, params, success, fail) {