Merge branch 'dev_7.1.0' into feature-zyw-sc

src/pages/addAddress/addAddress.js

@@ -49,7 +49,6 @@ wxService.page({
     
     
   },
-
   /**
  * 生命周期函数--监听页面显示
  */

src/pages/confirmOrder/confirmOrder.js

 // pages/confirmOrder/confirmOrder.js
 const wxService = require('../../utils/wxService')
+const { memberId } = wx.getStorageSync('_baseUserInfo')
 
 wxService.page({
   /**
    * 页面的初始数据
    */
   data: {
-    addressInfo: '',
+    addressInfo: [],
     showSelectCoupon: false,
     skuIds: [],
     trolleySku2Buy: Array,
     currentOrderList: Array,
-    isSelect: false
+    isSelect: false,
+    goodsAddress: false,
+    citys: null,
+    cityView: '',
+    multiIndex: [0, 0, 0],
+    selectCityName: ['', '']
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    
   },
   /**
    * 生命周期函数--监听页面显示
@@ -30,12 +37,145 @@ wxService.page({
         this.calPreferentialPrice(trolleySku2Buy)  // 计算优惠价
       })
     }
+    this.initCitys()
+    // 地址列表
+    this.getAddressList()
   },
+
+  formSubmit(e) {
+    const { goodsAddress } = this.data
+    // 保存地址 && 支付
+    if (goodsAddress) {
+      if (!e.detail.value.name) {
+        wx.showToast({
+          title: `请输入姓名`,
+          icon: 'none'
+        })
+        return false;
+      }
+      if (!e.detail.value.phone) {
+        wx.showToast({
+          title: `请输入电话`,
+          icon: 'none'
+        })
+        return false;
+      }
+      if (!this.data.cityView) {
+        wx.showToast({
+          title: `请选择地区`,
+          icon: 'none'
+        })
+        return false;
+      }
+      if (!e.detail.value.address) {
+        wx.showToast({
+          title: `请输入详细地址`,
+          icon: 'none'
+        })
+        return false;
+      }
+
+      this.setData({
+        params: {
+          userId: memberId,
+          name: e.detail.value.name,
+          phone: e.detail.value.phone,
+          fullArea: this.data.cityView,
+          address: e.detail.value.address,
+          type: this.data.isSelect ? 1 : 0
+        }
+      })
+      wx.showLoading({
+        title: '加载中'
+      })
+
+      wxService.post(`/member/addressManage/save`, this.data.params).then(res => {
+        const { result } = res.data
+        if (result == 0) {
+          wx.hideLoading()
+          wx.showToast({
+            title: `保存成功`,
+            icon: 'none'
+          })
+          // 调起支付
+          this.handelGobuy()
+        }
+      })
+    } else {
+      // 调起支付
+      this.handelGobuy()
+    }
+
+  },
+  initCitys() {
+    wxService.getC1().then((c1) => {
+      return wxService.Promise.all([wxService.Promise.resolve(c1), wxService.getC2ByC1('北京'), wxService.getC3ByC2('北京北京市')])
+    }).then(res => {
+      const citys = res.map(item => {
+        return [...item]
+      })
+      this.setData({
+        citys
+      })
+    })
+  },
+  bindMultiPickerChange(e) {
+    const citys = this.data.citys
+    const multiIndex = e.detail.value
+    if (citys) {
+      const cityView = [citys[0][multiIndex[0]], citys[1][multiIndex[1]], citys[2][multiIndex[2]]].join(' ')
+      this.setData({
+        multiIndex,
+        cityView
+      }, () => {
+        console.log('================0', this.data.cityView, this.data.multiIndex)
+      })
+    }
+  },
+  bindMultiPickerColumnChange(e) {
+    const detail = e.detail
+    const index = detail.value
+    let cityName = ''
+    switch (detail.column) {
+      case 0:
+        cityName = this.data.citys[0][index]
+        this.data.selectCityName[0] = cityName
+        wxService.getC2ByC1(cityName)
+          .then(item => {
+            let c2 = [...item]
+            this.data.selectCityName[1] = c2[0]
+            return wxService.Promise.all([wxService.Promise.resolve(item), wxService.getC3ByC2(this.data.selectCityName.join(''))])
+          }).then((res) => {
+            this.setData({
+              'citys[1]': [...res[0]],
+              'citys[2]': [...res[1]]
+            })
+          })
+        break
+      case 1:
+        cityName = this.data.citys[1][index]
+        this.data.selectCityName[1] = cityName
+        wxService.getC3ByC2(this.data.selectCityName.join(''))
+          .then(item => {
+            this.setData({
+              'citys[2]': [...item]
+            })
+          })
+        break
+      default:
+        break
+    }
+  },
+
   handelChangeSelectVip() {
     this.setData({
       isSelect: !this.data.isSelect
     })
   },
+  // 默认地址 
+  selectAddress() {
+    wxService.router('/pages/myAddress/myAddress')
+  },
   // 计算优惠价
   calPreferentialPrice(trolleySku2Buy) {
     wx.showLoading({
@@ -67,7 +207,7 @@ wxService.page({
           delete data.appId
           wx.requestPayment(Object.assign({
             success(res) {
-              console.log('000000',res)
+              console.log('000000', res)
               wx.hideLoading()
               // 支付成功页面
               wxService.router('/subPackage/page/pages/paymentStatus/paymentStatus')
@@ -85,13 +225,49 @@ wxService.page({
       }
     })
   },
+  // 获取地址列表
+  getAddressList() {
+    wxService.post(`/member/addressManage/getall`, {
+      userId: memberId
+    }).then(res => {
+      if (!res) return false
+      const { result, data } = res.data
+      if (result == 0) {
+        if (!data.length) {
+          this.setData({
+            goodsAddress: true
+          })
+        } else {
+          // 缓存有没有地址
+          let hasDefalut = wx.getStorageSync('_defalutAddress')
+          let _defalutAddress = null
+
+          if(hasDefalut) {
+            _defalutAddress = hasDefalut
+          } else {
+            data.forEach(item=>{
+              if(item.type == 1){
+                _defalutAddress = item
+              }
+            })
+          }
+          
+          this.setData({
+            addressInfo: _defalutAddress
+          })
+        }
+      }
+    }).finally(() => {
+    })
+  },
   //获取微信地址
   chooseWxAddress() {
     wx.chooseAddress({
       success: (res) => {
-        console.log(res)
+        console.log('微信地址', res)
         this.setData({
-          addressInfo: res
+          goodsAddress: false,
+          addressInfo: res,
         })
       },
       fail: function (err) {

src/pages/confirmOrder/confirmOrder.wxml

 <!--pages/confirmOrder/confirmOrder.wxml-->
 <view class="page-confirm-order">
+	<form bindsubmit="formSubmit">
 		<view class="address-wrap">
-		<block wx:if="{{false}}">
+			<block wx:if="{{goodsAddress}}">
 				<view class="address-section">
-				<input class="address-input" placeholder="请输入收货人姓名" />
-				<input class="address-input" placeholder="请输入手机号码" />
+					<input class="address-input" name="name" placeholder="请输入收货人姓名" />
+					<input class="address-input" name="phone" placeholder="请输入手机号码" />
 				</view>
 				<view class="address-section">
-				<!-- <view class="">所在区域</view> -->
 					<picker
 					 class="address-input address-picker"
-				 mode="region"
-				 bindchange="bindRegionChange"
-				 value="{{region}}"
-				 custom-item="{{customItem}}"
+					 mode="multiSelector"
+					 bindchange="bindMultiPickerChange"
+					 bindcolumnchange="bindMultiPickerColumnChange"
+					 value="{{multiIndex}}"
+					 range="{{citys}}"
 					>
-					<view class="picker-choose" />
+						<view class="form-picker" style="padding-top: 8rpx;" wx:if="{{cityView}}">
+							{{cityView}}
+						</view>
+						<view wx:if="{{!cityView}}">
+							<input
+							 class='form-input'
+							 placeholder-class="placeholder-picker"
+							 style="padding-top: 8rpx;"
+							 type="text"
+							 disabled
+							 placeholder="所在区域"
+							/>
+						</view>
 					</picker>
 				</view>
 				<view class="address-section">
-				<input class="address-input address-detail" placeholder="请输入路名门牌号" />
+					<input class="address-input address-detail" name="address" placeholder="请输入路名门牌号" />
 				</view>
 			</block>
-		<block>
-			<view class="address-list">
+			<block wx:if="{{!goodsAddress}}">
+				<view class="address-list" bindtap="selectAddress">
 					<view class="address-info">
 						<view>
-						<text class="user-name">{{addressInfo.userName}}</text>
-						<text class="phone-number">{{addressInfo.telNumber}}</text>
+							<image class="defalut-add-img" src="{{addressInfo.type == 1 ? '/assets/imgs/7_1_0/08_22/defalut.png' : '/assets/imgs/7_1_0/08_22/no-defalut.png'}}" />
+							<text class="user-name">{{addressInfo.name}}</text>
+							<text class="phone-number">{{addressInfo.phone}}</text>
 						</view>
 						<view class="address-list-detail">
-						{{addressInfo.provinceName}} {{addressInfo.cityName}} {{addressInfo.countyName}} {{addressInfo.detailInfo}}
+							{{addressInfo.fullArea}} {{addressInfo.address}}
 						</view>
 						<view class="arrow-right-wrap">
 							<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
@@ -135,8 +149,14 @@
 				<text class="cost-label">实付款：</text>
 				<text class="cost-price">￥306</text>
 			</view>
-		<view class="theme-color buy-btn" bindtap="handelGobuy">立即购买</view>
+			<!-- <button form-type="submit" class="theme-color buy-btn">立即购买</button>-->
+		<!--	<view class="theme-color buy-btn" bindtap="handelGobuy">立即购买</view> -->
+
+			<view class="theme-color buy-btn">
+				<button form-type="submit" style="display: inline;" class="theme-color buy-btn">立即购买</button>
+			</view>
 		</view>
+	</form>
 </view>
 <!--goHome-->
 <go-home/>

src/pages/confirmOrder/confirmOrder.wxss

 /* pages/confirmOrder/confirmOrder.wxss */
+@import './../../base/base.wxss';
+.defalut-add-img {
+  width: 84rpx;
+  height: 33rpx;
+  border-radius: 16rpx;
+  /* background-color: rgba(203, 60, 60, 1); */
+}
 .address-wrap{
   padding: 0 30rpx;
 }
@@ -13,7 +20,7 @@
   background-color: rgba(238, 238, 238, 1);
   opacity: 0.5;
   padding: 0 20rpx;
-  color: rgba(0, 0, 0, 0.25);
+  color: #000;
   font-size: 28rpx;
   margin-bottom: 18rpx;
 }
@@ -23,6 +30,7 @@
 .address-picker{
   flex: 1;
 }
+
 .picker-choose{
   color: rgba(0, 0, 0, 0.25);
   font-size: 28rpx;

src/pages/myAddress/myAddress.js

@@ -24,7 +24,15 @@ wxService.page({
   onLoad: function (options) {
 
   },
-
+  handelCheckShopAddress(e) {
+    const index = e.currentTarget.dataset.index
+    const item = this.data.addressList[index]
+
+    wx.setStorageSync('_defalutAddress', item)
+    setTimeout(() => {
+      wxService.router().back()
+    }, 300)
+  },
 
   /**
    * 生命周期函数--监听页面显示

src/pages/myAddress/myAddress.wxml

@@ -14,7 +14,9 @@
 			 bindtouchstart="drawStart"
 			 bindtouchmove="drawMove"
 			 bindtouchend="drawEnd"
+       bindtap='handelCheckShopAddress'
 			 style="right:{{item.right}}rpx"
+       data-id="{{item.id}}"
 			 data-index="{{index}}"
 			>
 				<view class="name">
@@ -27,7 +29,7 @@
 				 data-type="{{item.type}}"
 				 data-id="{{item.id}}"
 				>
-					<view class="{{item.type == 1 ? 'theme-color' : ''}} circle-radio">
+					<view class="{{item.type == 1 ? 'theme-color' : ''}} circle-radio check-default-address">
 						<image
 						 wx:if="{{item.type == 1}}"
 						 class="tick-success"

src/pages/myAddress/myAddress.wxss

@@ -80,9 +80,11 @@ page{
 .tick-success{
   width: 18rpx;
 }
+
 .default-address{
   display: flex;
   margin-top: 25rpx;
+  width: 250rpx;  
 }
 .setting-default{
   margin-left: 19rpx;

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 16,
+			"current": 17,
 			"list": [
 				{
 					"id": -1,
@@ -151,7 +151,7 @@
 					"id": 17,
 					"name": "确认订单",
 					"pathName": "pages/confirmOrder/confirmOrder",
-					"query": "trolleySku2Buy=[{\"count\":3,\"skuId\":1556108807316001},{\"count\":1,\"skuId\":1556108807316000}]",
+					"query": "trolleySku2Buy=[{\"count\":1,\"skuId\":2000704}]",
 					"scene": null
 				},
 				{