增加门店自提功能

app.json

@@ -70,7 +70,9 @@
 		"pages/user/proxyApply/proxyApply",
 		"pages/user/proxyList/proxyList",
 		"pages/user/proxyReview/proxyReview",
-		"pages/user/userInfo/userInfo"
+		"pages/user/userInfo/userInfo",
+		"pages/user/selfReceive/selfReceive",
+		"pages/user/selfReceive/newReceive/newReceive"
       ]
     },
     {

packageUser/pages/user/order/order.wxml

@@ -3,7 +3,7 @@
   
   <view class="orderDetail-address"  wx:if="{{order.status !== 'unpay' && order.status !== 'closed'}}">
     <view class="orderDetail-address__info">
-      <view class="orderDetail-address__name">收件人：{{order.contact}}</view>
+      <view class="orderDetail-address__name">{{order.pick_way == 0 ? '收件人：' : '提货人：'}}{{order.contact}}</view>
       <view class="orderDetail-address__tel">{{order.tel}}</view>
       <view class="clean"></view>
     </view>

packageUser/pages/user/selfReceive/newReceive/newReceive.js

@@ -0,0 +1,112 @@
+var _request = require('../../../../../utils/request.js')
+var validator = require('../../../../../utils/validator.js')
+var _handle = require('../../../../../utils/handle.js')
+Page({
+  data: {
+    address: '请选择',
+    region: ['北京市', '北京市', '东城区'],
+    name: '',
+    tel: 0,
+    more: '',
+    type: 0,//0为新建，1为编辑
+	remark:''
+  },
+  onLoad: function (options) {
+  	console.log('options',options)
+  	if(options.type == 1){
+  		var address = wx.getStorageSync('editAddr');
+  		console.log('addrhere',address)
+  		this.setData({
+			type: 1,
+			tel:address.tel,
+			name:address.contact,
+			addrid:address.id,
+			remark:address.remark
+		  })
+  	}
+  },
+  bindName: function (e) {
+    this.setData({
+      name: e.detail.value
+    })
+  },
+  bindTel: function (e) {
+    this.setData({
+      tel: e.detail.value
+    })
+  },
+  bindRemark: function (e) {
+    this.setData({
+      remark: e.detail.value
+    })
+  },
+  bindMore: function (e) {
+    this.setData({
+      more: e.detail.value
+    })
+  },
+  validate () {
+    var msg
+    if (!validator.required(this.data.name)) {
+      msg = '提货人不能为空'
+    } else if (!validator.required1(this.data.name)) {
+      msg = '国家安全局规定：运单禁止出现“先生”，“小姐”，“女士”等，请填写完整名字'
+    } else if (!validator.required(this.data.tel)) {
+      msg = '联系电话不能为空'
+    } else if (!validator.telphone(this.data.tel)) {
+      msg = '手机号码格式不正确'
+    } 
+    return { isOk: !msg, msg }
+  },
+  save: function (e) {
+    _handle.setFormId(e)
+    var { isOk, msg } = this.validate()
+    if (isOk) {
+      this.requestAddress()
+    } else {
+      wx.showToast({
+        title: msg,
+        icon: 'none',
+        duration: 2000
+      })
+    }
+  },
+  requestAddress () {
+	  console.log('requestAddress')
+    var that = this
+    
+    if(that.data.type == 1){
+    	var url = 'v1/pick_address/'+that.data.addrid;
+    }else{
+    	var url = 'v1/pick_address';
+    }
+    var params = {
+      contact: this.data.name,
+      tel: this.data.tel,
+      set_default: 1,
+    }
+    var success = function (res) {
+      wx.navigateBack({
+        delta: 1
+      })
+    }
+    if(that.data.type == 1){
+    	_request.$put(url, params, success)
+    }else{
+    	_request.$post(url, params, success)
+    }
+    
+  },
+  bindRegionChange: function (e) {
+    console.log(e)
+    this.setData({
+      region: e.detail.value,
+      address: e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
+    })
+  },
+  onShareAppMessage: function (val) {
+    return _request.share({
+      sc: 'xcx_user_newaddress'
+    })
+  }
+})

packageUser/pages/user/selfReceive/newReceive/newReceive.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "新增提货人",
+  "backgroundColor": "#f3f3f3"
+}

packageUser/pages/user/selfReceive/newReceive/newReceive.wxml

@@ -0,0 +1,23 @@
+<view class="bg">
+  <view class="newAddress-top"></view>
+  <view class="newAddress-line">
+    <view class="newAddress-title">提货人</view>
+    <input maxlength="11" class="nameText" placeholder="请填写提货人姓名" placeholder-class="text-placeholder" bindinput="bindName" value="{{name}}"/>
+    <view class="clean"></view>
+  </view>
+  <view class="newAddress-line">
+    <view class="newAddress-title">联系电话</view>
+    <input type="number" maxlength="12" class="nameText" placeholder="请填写提货人联系电话" placeholder-class="text-placeholder" bindinput="bindTel" value="{{tel!=0?tel:''}}"/>
+    <view class="clean"></view>
+  </view>
+  <!-- <view class="newAddress-line">
+    <view class="newAddress-title">备注信息</view>
+    <input class="nameText" placeholder="请填写备注信息" placeholder-class="text-placeholder" bindinput="bindRemark" value="{{remark}}"/>
+    <view class="clean"></view>
+  </view> -->
+  <form bindsubmit="save" report-submit="{{true}}" class="newAddress-form">
+    <button formType="submit" class="newAddress-btn">
+      保存
+    </button>
+  </form>
+</view>

packageUser/pages/user/selfReceive/newReceive/newReceive.wxss

@@ -0,0 +1,153 @@
+.bg {
+  position: relative;
+  width: 100%;
+  min-height: 100%;
+  background-color: #f3f3f3;
+}
+.newAddress-top {
+  height: 20rpx;
+}
+.newAddress-line {
+  height: 90rpx;
+  line-height: 90rpx;
+  background-color: #fff;
+  font-size: 28rpx;
+  border-bottom: 1px solid #eeeeee;
+}
+.newAddress-title {
+  float: left;
+  margin-left: 20rpx;
+  color: #4c4c4c;
+}
+.text-placeholder {
+  color: #bbbbbb;
+}
+.nameText {
+  width: 400rpx;
+  height: 90rpx;
+  line-height: 90rpx;
+  color: #4c4c4c;
+  float: right;
+  text-align: right;
+  padding-right: 20rpx;
+}
+.newAddress-picker {
+  float: right;
+  text-align: right;
+  color: #bbbbbb;
+}
+.newAddress-picker__icon {
+  float: right;
+  margin-top: 33rpx;
+  margin-right: 20rpx;
+  margin-left: 12rpx;
+  width: 13rpx;
+  height: 24rpx;
+}
+.newAddress-picker__text {
+  float: right;
+  width: 500rpx;
+}
+.newAddress-more {
+  background-color: #fff;
+}
+.newAddress-more {
+  padding: 30rpx 20rpx;
+}
+.newAddress-more__title {
+  font-size: 28rpx;
+  color: #4c4c4c;
+}
+.newAddress-form {
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 90rpx;
+}
+.newAddress-btn {
+  width: 100%;
+  height: 100%;
+  background-color: #eab86a;
+  color: #fff;
+  line-height: 90rpx;
+  text-align: center;
+  font-size: 28rpx;
+}
+.textarea {
+  padding-top: 20rpx;
+  display: block;
+  width: 710rpx;
+  min-height: 200rpx;
+  line-height: 40rpx;
+  font-size: 28rpx;
+  color: #4c4c4c
+}
+.distpicker {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 560rpx;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    background-color: #fff;
+    font-size:28rpx;
+    color:#666;
+}
+.distpicker-btn {
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 0 40rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    background-color: #fafafa;
+    color: #eab86a;
+}
+.distpicker-content {
+    box-sizing: border-box;
+    width: 100%;
+    height: 560rpx;
+    background-color: #fff;
+    text-align: center;
+}
+.mask {
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 998;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, .4);
+}
+.hidden {
+  display: none;
+}
+.area-item {
+  line-height: 80rpx;
+}
+.newAddress-tip {
+  height: 245rpx;
+  margin-top: 30rpx;
+  background: #ffffff;
+  padding-top: 40rpx;
+  padding-left: 30rpx;
+  padding-right: 20rpx;
+}
+.tip-title {
+  font-size: 33rpx;
+  color: #4e4e4e;
+  padding-bottom: 20rpx;
+}
+.tip-in {
+  font-size: 28rpx;
+  color: #4e4e4e;
+  line-height: 45rpx;
+}
+.tip-color {
+  color: #fe6565;
+}

packageUser/pages/user/selfReceive/selfReceive.js

@@ -0,0 +1,100 @@
+var _request = require('../../../../utils/request.js')
+var _handle = require('../../../../utils/handle.js')
+Page({
+  data: {
+    addressList: []
+  },
+  onLoad: function (options) {
+	  this.getAddressList()
+  },
+  onShow () {
+    this.getAddressList()
+  },
+  getAddressList () {
+    var that = this
+    var url = 'v1/pick_address'
+    var params = {
+    }
+    var success = function (res) {
+      that.setData({
+        addressList: res.data
+      })
+    }
+    _request.$get(url, params, success)
+  },
+  delAddress (val) {
+    var that = this
+    var id = val.currentTarget.dataset.val
+    wx.showModal({
+      title: '提示',
+      content: '确定删除该地址？',
+      success: function(res) {
+        if (res.confirm) {
+          that.delAddressReques(id)
+        } else if (res.cancel) {
+        }
+      }
+    })
+  },
+  delAddressReques (val) {
+    var id = val
+    var that = this
+    var url = 'v1/pick_address/' + id
+    var params = {
+    }
+    var success = function (res) {
+      that.getAddressList()
+      wx.showToast({
+        title: '删除地址成功',
+        icon: 'none',
+        duration: 2000
+      })
+    }
+    _request.$del(url, params, success)
+  },
+  defaultAddress (val) {
+    var id = val.currentTarget.dataset.val
+    var that = this
+    var url = 'v1/pick_address/' + id + '/default'
+    var params = {
+    }
+    var success = function (res) {
+    	wx.setStorageSync('use_pick_address', false) //存入地址
+      // wx.navigateBack({
+      //   delta: 1
+      // })
+      that.getAddressList()
+    }
+    _request.$put(url, params, success)
+  },
+  setAddress(val){
+  	console.log(val)
+  	var index = val.currentTarget.dataset.index;
+  	console.log('pick_addressindex',index);
+  	wx.setStorageSync('use_pick_address', this.data.addressList[index]) //存入地址
+  	wx.navigateBack({
+        delta: 1
+    })
+  },
+  addAddress (e) {
+    _handle.setFormId(e)
+    wx.navigateTo({
+      url: '/packageUser/pages/user/selfReceive/newReceive/newReceive'
+    })
+  },
+  onShareAppMessage: function (val) {
+    return _request.share({
+      sc: 'xcx_user_address'
+    })
+  },
+  editAddress(e){
+  	var listid = e.currentTarget.dataset.listid;
+  	console.log('listid',listid);
+  	var address = this.data.addressList[listid];
+  	console.log('address',address);
+		wx.setStorageSync('editAddr', address);
+		wx.navigateTo({
+      url: '/packageUser/pages/user/selfReceive/newReceive/newReceive?type=1'
+    })
+  }
+})

packageUser/pages/user/selfReceive/selfReceive.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "提货人列表",
+  "backgroundColor": "#f3f3f3"
+}

packageUser/pages/user/selfReceive/selfReceive.wxml

@@ -0,0 +1,37 @@
+<view class="bg">
+  <view style="height: 20rpx;"></view>
+  <view class="address" wx:key="{{index}}" wx:for="{{addressList}}" wx:for-index="index">
+    <view class="address-info" bindtap="setAddress" data-index="{{index}}">
+      <view>
+        <view class="address-name ellipsis">{{item.contact}}</view>
+        <view class="address-tel">{{item.tel}}</view>
+        <view class="clean"></view>
+      </view>
+    </view>
+    <view class="address-handle">
+      <view class="address-default" data-val="{{item.id}}" bindtap="defaultAddress">
+        <image class="address-default__icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/address.png" wx:if="{{item.state === 1}}"></image>
+        <view class="address-default__no" wx:if="{{item.state !== 1}}"></view>
+        <view class="address-default__text">设为默认提货人</view>
+        <view class="clean"></view>
+      </view>
+      
+      <view class="address-del">
+        <image class="address-del__icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/addressdel.png"></image>
+        <view class="address-del__text" data-val="{{item.id}}" bindtap="delAddress">删除</view>
+        <view class="clean"></view>
+      </view>
+      <view class="address-edit" bindtap="editAddress" data-listid="{{index}}">
+      	编辑
+      </view>
+      
+      <view class="clean"></view>
+    </view>
+  </view>
+  <view style="height: 90rpx;"></view>
+  <form bindsubmit="addAddress" report-submit="{{true}}" class="address-form">
+    <button formType="submit" class="address-btn">
+      添加提货人
+    </button>
+  </form>
+</view>

packageUser/pages/user/selfReceive/selfReceive.wxss

@@ -0,0 +1,99 @@
+.bg {
+  position: relative;
+  width: 100%;
+  min-height: 100%;
+  background-color: #f3f3f3;
+}
+.address {
+  padding: 20rpx 20rpx 0;
+  background-color: #fff;
+  font-size: 28rpx;
+  margin-bottom: 20rpx;
+}
+.address-info {
+height: 60rpx;
+  color: #4c4c4c;
+  border-bottom: 1px solid #eeeeee;
+}
+.address-name {
+  float: left;
+  width: 450rpx;
+}
+.address-tel {
+  float: right;
+}
+.address-province {
+  margin-right: 10rpx;
+}
+.address-more {
+  margin-top: 16rpx;
+  -webkit-line-clamp: 2;
+}
+.address-handle {
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.address-default {
+  float: left;
+  height: 80rpx;
+}
+.address-default__icon {
+  float: left;
+  display: block;
+  width: 44rpx;
+  height: 44rpx;
+  margin-top: 18rpx;
+  margin-right: 10rpx;
+}
+.address-default__no {
+  float: left;
+  width: 43rpx;
+  height: 43rpx;
+  margin-top: 18rpx;
+  margin-right: 10rpx;
+  border: 1px solid #dddddd;
+  border-radius: 3rpx;
+  background-color: #f3f3f3;
+}
+.address-default__text {
+  float: left;
+}
+.address-del {
+  float: right;
+  height: 80rpx;
+}
+.address-del__icon {
+  float: left;
+  display: block;
+  margin-top: 26rpx;
+  margin-right: 10rpx;
+  width: 28rpx;
+  height: 28rpx;
+}
+.address-del__text {
+  float: left;
+  color: #bbbbbb;
+}
+.address-form {
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 90rpx;
+}
+.address-btn {
+  width: 100%;
+  height: 100%;
+  background-color: #eab86a;
+  color: #fff;
+  line-height: 90rpx;
+  text-align: center;
+  font-size: 28rpx;
+}
+
+.address-edit{
+display: inline-block;
+float: right;
+margin-right: 15px;
+color: #eab86a;
+}

pages/pay/pay.js

@@ -7,7 +7,9 @@ Page({
     orderId: 0,
     payData: {},
     address: null,
+	pick_address: null,
     selectaddress:false,
+	selectpickaddress:false,
     balanceInfo: {},
     centInfo:{},
     userInfo: {},
@@ -30,26 +32,46 @@ Page({
     payFlag:false,
     useBalance:false,
     afterdec:0,//使用提货券扣除后的总额
-	remark:''
+	remark:'',
+	
+	
+	receivetype:0,//提货方式
+	pickdepartsList:[],
+	repickdepartsList:[],
+	pickindex:0,
+	pickid:0,
   },
   onLoad: function (options) {
     this.data.orderId = options.orderId;
     this.getOrderInfo()
 //  this.getBalanceInfo()
-    wx.setStorageSync('use_address', false)
+    wx.setStorageSync('use_address', false);
+    wx.setStorageSync('receivetype', 0);
+	this.getpickdeparts();
   },
   onShow: function () {
     this.getUserInfo()
-    var address = wx.getStorageSync('use_address');
-  	if(address){
-  		this.setData({
-	      address: address,
-	      selectaddress:true
-	    });
-	    wx.setStorageSync('use_address', false)
-  	}else{
-//  	this.getDefaultAddress()
-  	}
+    
+	var receivetype = wx.getStorageSync('receivetype');
+	if(receivetype == 0){
+		var address = wx.getStorageSync('use_address');
+		if(address){
+			this.setData({
+			  address: address,
+			  selectaddress:true,
+			  receivetype : receivetype
+			});
+		}
+	}else{
+		var address = wx.getStorageSync('use_pick_address');
+		if(address){
+			this.setData({
+			  pick_address: address,
+			  selectpickaddress:true,
+			  receivetype : receivetype
+			});
+		}
+	}
   	
   	this.setData({
       payFlag: false
@@ -191,7 +213,8 @@ Page({
     this.setData({
       payFlag: true
     })
-    if (!that.data.address) {
+	
+    if (that.data.receivetype == 0 && !that.data.address) {
       wx.showToast({
         title: '请先填写地址',
         icon: 'none',
@@ -200,7 +223,7 @@ Page({
       that.setData({
 	      payFlag: false
 	    })
-    } else if (!validator.required1(this.data.address.contact)) {
+    } else if (that.data.receivetype == 0 && !validator.required1(this.data.address.contact)) {
       wx.showToast({
         title: '国家安全局规定：运单禁止出现“先生”，“小姐”，“女士”等，请重新填写地址',
         icon: 'none',
@@ -209,6 +232,24 @@ Page({
       that.setData({
 	      payFlag: false
 	    })
+    }else if (that.data.receivetype == 1 && !that.data.pick_address) {
+      wx.showToast({
+        title: '请先选择提货人',
+        icon: 'none',
+        duration: 2000
+      })
+      that.setData({
+          payFlag: false
+        })
+    }else if (that.data.receivetype == 1 && !that.data.pickid) {
+      wx.showToast({
+        title: '请选择自提门店',
+        icon: 'none',
+        duration: 2000
+      })
+      that.setData({
+          payFlag: false
+        })
     } else {
       if (that.data.curPayway === 'balance') {
         var p
@@ -316,15 +357,32 @@ Page({
   pay: function () {
     var that = this
     var url = "v1/pay";
-    var params = {
-      order_id: that.data.orderId,
-      trad_pwd: that.data.pwd,
-      pay_way: that.data.curPayway,
-      address_id: that.data.address.id,
-      s: 'xcx',
-      use_coupon:that.data.useBalance,
-	  remark:that.data.remark
-    }
+	var params;
+	if(that.data.receivetype == 0){
+		params = {
+		  pick_way: 0,
+		  order_id: that.data.orderId,
+		  trad_pwd: that.data.pwd,
+		  pay_way: that.data.curPayway,
+		  address_id: that.data.address.id,
+		  s: 'xcx',
+		  use_coupon:that.data.useBalance,
+		  remark:that.data.remark
+		}
+	}else{
+		params = {
+		  pick_way: 1,
+		  order_id: that.data.orderId,
+		  trad_pwd: that.data.pwd,
+		  pay_way: that.data.curPayway,
+		  s: 'xcx',
+		  use_coupon:that.data.useBalance,
+		  remark:that.data.remark,
+		  pick_dept:that.data.pickid,
+		  pick_addr_id:that.data.pick_address.id
+		}
+	}
+    
     
     console.log('onpay',params)
     var success = function (val) {
@@ -407,5 +465,38 @@ Page({
     this.setData({
       remark: e.detail.value
     })
-  }
+  },
+  
+  
+  
+  receivetbn(e){
+	this.setData({
+		receivetype: e.target.dataset.value
+	})
+	wx.setStorageSync('receivetype', e.target.dataset.value) //存入
+  },
+  getpickdeparts: function () {
+    var that = this
+    var url = "v1/pick_departs";
+    var params = {}
+    var success = function (val) {
+		let list = [];
+		for(var i in val.data){
+			list.push(val.data[i]['pick_address']+'-'+val.data[i]['pick_title'])
+		}
+		that.setData({
+			pickdepartsList:val.data,
+			repickdepartsList:list
+		})
+    }
+    __request.$get(url, params, success)
+  },
+  bindPickerChange: function(e) {
+      console.log('picker发送选择改变，携带值为', e.detail.value)
+	  var that = this;
+      this.setData({
+        pickindex: e.detail.value,
+		pickid:that.data.pickdepartsList[e.detail.value]['id']
+      })
+   },
 })

pages/pay/pay.wxml

@@ -1,22 +1,51 @@
 <view class="app app-bg">
-  <view class="pay-address" wx:if="{{selectaddress && address !== null}}">
-    <navigator url="/packageUser/pages/user/address/address">
-    <view class="pay-font">
-      <text class="fl">收件人: {{address.contact}}</text>
-      <text class="fr">{{address.tel}}</text>
-      <view class="clean"></view>
-    </view>
-    <view  class="pay-font">
-      <text>收件地址：{{address.province}}{{address.city}}{{address.district}}{{address.address}}</text>
-    </view>
-    <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/arrow_right.jpg" class="pay-arrowR"></image>
-    </navigator>
-  </view>
+	<view class="receivetab">
+		<view class="{{receivetype == 0 ? 'receivetab_tit act' : 'receivetab_tit'}}" bindtap="receivetbn" data-value="0">快递运输</view>
+		<view class="{{receivetype == 1 ? 'receivetab_tit act' : 'receivetab_tit'}}" bindtap="receivetbn" data-value="1">门店自提</view>
+	</view>
+<view wx:if="{{receivetype == 0}}">
+	<view class="pay-address" wx:if="{{selectaddress && address !== null}}">
+		<navigator url="/packageUser/pages/user/address/address">
+			<view class="pay-font">
+			  <text class="fl">收件人: {{address.contact}}</text>
+			  <text class="fr">{{address.tel}}</text>
+			  <view class="clean"></view>
+			</view>
+			<view  class="pay-font">
+			  <text>收件地址：{{address.province}}{{address.city}}{{address.district}}{{address.address}}</text>
+			</view>
+			<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/arrow_right.jpg" class="pay-arrowR"></image>
+		</navigator>
+	</view>
 
-  <view class="pay-address" wx:if="{{!selectaddress}}">
-  	<!--<navigator url="/packageUser/pages/user/newAddress/newAddress" class="pay-address-add">点击新增地址</navigator>-->
-    <navigator url="/packageUser/pages/user/address/address" class="pay-address-add">点击选择收货地址</navigator>
-  </view>
+	<view class="pay-address" wx:if="{{!selectaddress}}">
+		<!--<navigator url="/packageUser/pages/user/newAddress/newAddress" class="pay-address-add">点击新增地址</navigator>-->
+		<navigator url="/packageUser/pages/user/address/address" class="pay-address-add">点击选择收货地址</navigator>
+	</view>
+</view>
+<view wx:else>
+	<view class="pay-address" wx:if="{{selectpickaddress && pick_address !== null}}">
+		<navigator url="/packageUser/pages/user/selfReceive/selfReceive">
+			<view class="pay-font" style="line-height: 75rpx;margin-bottom:0">
+			  <text class="fl">自提人：{{pick_address.contact}}</text>
+			  <text class="fr">{{pick_address.tel}}</text>
+			  <view class="clean"></view>
+			</view>
+			<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/arrow_right.jpg" class="pay-arrowR"></image>
+		</navigator>
+	</view>
+
+	<view class="pay-address" wx:if="{{!selectpickaddress}}">
+		<!--<navigator url="/packageUser/pages/user/newAddress/newAddress" class="pay-address-add">点击新增地址</navigator>-->
+		<navigator url="/packageUser/pages/user/selfReceive/selfReceive" class="pay-address-add">点击选择提货人</navigator>
+	</view>
+	
+	<picker bindchange="bindPickerChange" value="{{index}}" range="{{repickdepartsList}}">
+	    <view class="picker">
+	      {{pickid ? '自提点：'+repickdepartsList[pickindex] : '自提点：点击选择自提门店'}}
+	    </view>
+	</picker>
+</view>
 
   <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/border.jpg" class="pay-border"></image>
 

pages/pay/pay.wxss

@@ -428,4 +428,29 @@ color:#4c4c4c;
 .remark{
 	border-top: 15px solid #eee;
 	    padding: 25rpx;
+}
+
+.receivetab{
+	overflow: hidden;
+	    display: block;
+	    background: #fff;
+}
+.receivetab_tit{
+	width: 50%;
+	    float: left;
+	    text-align: center;
+	    padding: 25rpx;
+	    box-sizing: border-box;
+		color: #666;
+		border-bottom: 2px solid #eee;
+}
+.receivetab_tit.act{
+	border-bottom: 2px solid #eab86a;
+	    color: #eab86a;
+}
+.picker{
+	color: #333;
+	    padding: 20rpx;
+	    background: #FFF;
+	    font-size: 28rpx;
 }