update

app.json

@@ -130,6 +130,12 @@
         "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/cashDetail/cashDetail.js

@@ -10,7 +10,7 @@ Page({
   },
   getRadish () {
     var that = this
-    var url = 'v1/user/balance/' + rid
+    var url = 'v1/user/cash/balance/' + rid
     var params = {
     }
     var success = function (res) {

packageUser/pages/user/silver/silver.wxml

@@ -9,6 +9,13 @@
       <view class="radish-top__btn1">购买佣金</view>
     </navigator> -->
   </view>
+  <view class="silver-help-height"></view>
+  <view class="silver-help">
+  	<text>银豆为用户购买套餐后赠送给客户的优惠抵扣券，不可转给他人，不可提现，只能自己在购买商品时抵扣用。</text>
+  	<text>1、使用规则：产品时可以抵扣不同金额的银豆，1银豆=1元，可抵扣的额度见商品详情页标示。</text>
+  	<text>2、使用期限：自银豆到账后15个月内使用，到期后银豆将自动清零。</text>
+  	<text>银豆活动最终解释权归城市公司所有</text>
+  </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}}">

packageUser/pages/user/silver/silver.wxss

@@ -92,4 +92,25 @@
   line-height: 100rpx;
   text-align: right;
   color: #eab86a;
+}
+
+.silver-help-height{
+	height: 240rpx;
+	    background: linear-gradient(#f2bb2d, #f3f3f3);
+}
+.silver-help{
+    padding: 15px;
+    background: rgb(230 35 29 / 0.7);
+    font-size: 26rpx;
+    position: absolute;
+    width: 96%;
+    left: 2%;
+    box-sizing: border-box;
+	top: 250rpx;
+    border-radius: 4px;
+}
+.silver-help text{
+margin-bottom: 10rpx;
+    display: block;
+    color: #fff;
 }

pages/cart/cart.wxml

@@ -49,10 +49,10 @@
 			  <view class="time-text">{{seckillruntimearr[index]}}</view>
 			</view>
 			<view class="main_item">
-		      <movable-area style="{{item.package?'height:'+(210+item.package_list.length * 28)+'rpx':''}}">
-		        <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" style="{{item.package?'height:'+(210+item.package_list.length * 28)+'rpx':''}}">
-		          <view class="main_item_content ">
-		          		  <view class="cartlist_item">
+		      <movable-area style="{{item.package?'height:'+(210+item.package_list.length * 25)+'rpx':''}}">
+		        <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" style="{{item.package?'height:'+(210+item.package_list.length * 25)+'rpx':''}}">
+		          <view class="main_item_content " >
+		          		  <view class="cartlist_item" style="{{item.package?'height:'+(210+item.package_list.length * 25)+'rpx':''}}">
 						   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.original_price}}" data-index="{{index}}">
 						   	  	<text class="pay-circle"></text>
 						   	  </view> 
@@ -63,12 +63,13 @@
 						        <!-- <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 style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{item.sale_zone_name}}</i>{{item.product_name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
 						        
+								<view style="font-size: 22rpx;color: #666;margin: 10rpx 0;" wx:if="{{item.silver > 0}}">可抵扣银豆数：￥{{item.silver / 100}}</view>
 								<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>
+										<p style="white-space: nowrap;text-overflow: ellipsis;overflow: hidden;display: block;font-size: 23rpx;">{{pack.item_title}} x{{pack.nums}}</p>
 									</view>
 								</view>
-								<view class="cartlist_type" wx:else>---</view>
+								<view class="cartlist_type" wx:else>--</view>
 								
 						        <currency class="cartlist_price" symbol="￥" value="{{item.original_price}}" />
 						        <view class="cartlist_num">
@@ -83,7 +84,7 @@
 		          </view>
 		        </movable-view>
 		      </movable-area>
-		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem" style="{{item.package?'height:'+(210+item.package_list.length * 28)+'rpx;line-height:'+(210+item.package_list.length * 28)+'rpx':''}}">删除</view>
+		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem" style="{{item.package?'height:'+(210+item.package_list.length * 25)+'rpx;line-height:'+(210+item.package_list.length * 25)+'rpx':''}}">删除</view>
 		    </view>
 	    </view>
 	</view>

pages/customservice/customservice.wxml

@@ -1,12 +1,12 @@
 <view class="bg">
-  <view class="qcbg">
-    <image src="{{qr}}" class="erweima"/>
-    <view class="text1">我是您的专属客服</view>
-    <view class="text2">任何疑问 , 专属客服妹纸等你来撩！</view>
+  <!-- <view class="qcbg"> -->
+    <!-- <image src="{{qr}}" class="erweima" show-menu-by-longpress="{{true}}"/> -->
+    <!-- <view class="text1">长按二维码扫码联系客服</view> -->
+    <!-- <view class="text2">任何疑问 , 专属客服妹纸等你来撩！</view> -->
     <!-- <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"/>
+    <!-- <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}}">
     <view class="popup" >
       <view class="popup-title">提示</view>
@@ -17,5 +17,12 @@
       <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
     </view>
   </view>
+  
+  <view class="kfqr-dialog">
+  	<view class="kfqr">
+  		<image src="{{qr}}" show-menu-by-longpress="{{true}}"></image>
+  		<text>长按扫码联系客服</text>
+  	</view>
+  </view>
 </view>
 

pages/customservice/customservice.wxss

@@ -1,15 +1,26 @@
 .bg {
   position: relative;
   min-height: 100%;
-  padding-bottom: 20rpx;
+  background: #eee;
+  background: url(http://fohow.oss-cn-shenzhen.aliyuncs.com/customer/bg_kf.png) no-repeat;
+      background-size: 100% 120%;
+  /* padding-bottom: 20rpx; */
 }
-.qcbg {
+/* .qcbg {
   height: 740rpx;
   width: 100%;
   background: #fff;
   background:url(http://fohow.oss-cn-shenzhen.aliyuncs.com/customer/bg_kf.png) no-repeat;
   background-size:750rpx 718rpx;
   overflow: hidden;
+} */
+.qcbg {
+height: 1400rpx;
+    width: 100%;
+    background: #fff;
+    background: url(http://fohow.oss-cn-shenzhen.aliyuncs.com/customer/bg_kf.png) no-repeat;
+    background-size: 100% 100%;
+    overflow: hidden;
 }
 .erweima{
   display: block;
@@ -131,4 +142,32 @@
 }
 button::after{
 border: none;
-}
+}
+
+
+.kfqr-dialog{
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    /* background: rgba(0,0,0,0.5); */
+    z-index: 9;
+    text-align: center;
+}
+.kfqr{
+text-align: center;
+    width: 90%;
+    margin: 30% auto;
+    background: #797064;
+    padding: 30rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    color: #Fff;
+    font-size: 36rpx;
+    font-weight: bold;
+}
+.kfqr image{width: 100%;
+    height: 550rpx;}
+.kfqr text{    margin: 10px;
+    display: block;}

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

@@ -67,6 +67,9 @@ Page({
 　　lvListActive2:'/images/star_d_l.png',//未选中的
 	lvListActive3: '/images/star_a_r.png',//选中的
 　　lvListActive4:'/images/star_d_r.png',//未选中的
+
+	kfqr:'',//客服二维码
+	showqr:false
   },
   onLoad: function (options) {
     this.data.productId = options.id;
@@ -81,6 +84,8 @@ Page({
 	this.getProjectComment()
     // this.check()
 	this.info()
+	
+	this.getqcode()
   },
   onHide: function () {
     this.getneedshare()
@@ -1026,5 +1031,24 @@ Page({
 		showsharetips:!this.data.showsharetips
 	 })
 	  
+  },
+  getqcode: function () {
+    var that = this
+    var url = 'v1/customer_service/qrcode'
+    var params = {}
+    var success = function (res) {
+      that.setData({
+        kfqr: res.data
+      })
+    }
+    _request.$get(url, params, success)
+  },
+  tiggerQR:function(){
+	  this.setData({
+	    showqr: !this.data.showqr
+	  })
+  },
+  catchtapQR:function(){
+	  console.log('catchtapQR');
   }
 })

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

@@ -10,9 +10,19 @@
 		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 class="toolBox-item" bindtap="tiggerQR">
+		  <image src="../../../images/footer/kf.png" ></image>
+		</button>-->
+		<view class="kfqr-dialog" wx:if="{{showqr}}" bindtap="tiggerQR">
+			<view class="kfqr" catchtap="catchtapQR">
+				<image src="{{kfqr}}" show-menu-by-longpress="{{true}}"></image>
+				<text>长按扫码联系客服</text>
+			</view>
+		</view>
+		
 		
 		<button open-type="share" class="toolBox-item" wx:if="{{readOnly != 1}}">
 			<image src="../../../images/footer/wx.png" />
@@ -110,7 +120,7 @@
     </view>
     <view wx:if="{{project.no_delivery_area}}">    
       <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/product/product-icon/noaddress.png" class="detail-no-img1"/>
-      <view class="detail-no-text">不发货地区 : {{project.no_delivery_area}}</view>
+      <view class="detail-no-text">特殊发货区域 : {{project.no_delivery_area}}</view>
     </view>
   </view>
   

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

@@ -742,4 +742,29 @@ background: rgba(255,255,255,1);
 	    margin-right: 15rpx;
 	    text-align: center;
 	    line-height: 60rpx;
-}
+}
+
+
+.kfqr-dialog{
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0,0,0,0.5);
+    z-index: 9;
+    text-align: center;
+}
+.kfqr{
+	    text-align: center;
+	    width: 80%;
+	    margin: 20% auto;
+	    background: #797064;
+	    padding: 30rpx;
+	    box-sizing: border-box;
+	    border-radius: 10rpx;
+	    color: #Fff;
+	    font-size: 36rpx;
+	    font-weight: bold;
+}
+.kfqr image{width: 100%;}

pages/user/all/all.js

@@ -22,7 +22,9 @@ Page({
 	checkhead:true,
 	wxlogincode:'',
 	bindTelfirst:0,
-	cashbalance:0
+	cashbalance:0,
+	kfqr:'',//客服二维码
+	showqr:false
   },
   onLoad: function () {
 ////	console.log(options)
@@ -54,6 +56,7 @@ Page({
     this.info();
 	that.getBalanceInfo()
 	that.getCashBalanceInfo()
+	this.getqcode()
 	// that.getIntegralInfo()
     // if (this.data.bindTel) {
     //   this.getBalanceInfo()
@@ -588,5 +591,24 @@ Page({
     return _request.share({
       sc: 'xcx_user'
     })
+  },
+  getqcode: function () {
+    var that = this
+    var url = 'v1/customer_service/qrcode'
+    var params = {}
+    var success = function (res) {
+      that.setData({
+        kfqr: res.data
+      })
+    }
+    _request.$get(url, params, success)
+  },
+  tiggerQR:function(){
+  	  this.setData({
+  	    showqr: !this.data.showqr
+  	  })
+  },
+  catchtapQR:function(){
+  	  console.log('catchtapQR');
   }
 })

pages/user/all/all.wxml

@@ -178,11 +178,20 @@
         <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> -->
-	  <button class="user-line" open-type="contact" >
+	 <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>
-	  
+	  <!-- <button class="user-line" bindtap="tiggerQR" >
+	    <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="kfqr-dialog" wx:if="{{showqr}}" bindtap="tiggerQR">
+	  	<view class="kfqr" catchtap="catchtapQR">
+	  		<image src="{{kfqr}}" show-menu-by-longpress="{{true}}"></image>
+	  		<text>长按扫码联系客服</text>
+	  	</view>
+	  </view>
       <!--
       <view class="user-line" bindtap="toAbout" style="border:0;">
         <view class="user-line__title">关于商城</view>

pages/user/all/all.wxss

@@ -323,4 +323,28 @@ margin: 0 auto;
 border-radius: 4px;
 color: #eab86a;
 
-}
+}
+
+.kfqr-dialog{
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    /* background: rgba(0,0,0,0.5); */
+    z-index: 9;
+    text-align: center;
+}
+.kfqr{
+	    text-align: center;
+	    width: 90%;
+	    margin: 50% auto;
+	    background: #797064;
+	    padding: 30rpx;
+	    box-sizing: border-box;
+	    border-radius: 10rpx;
+	    color: #Fff;
+	    font-size: 36rpx;
+	    font-weight: bold;
+}
+.kfqr image{width: 100%;}