更新

packageIntegral/takeGoods/index.vue

@@ -5,21 +5,21 @@
 			<block slot="content">订单提货</block>
 		</cu-custom>
 
-		<view class="code">提货码: 1899</view>
+		<view class="code">提货码: {{code}}</view>
 
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
 			<view class="item" v-for="item,index in dataList" :key="index">
-				<view class="header">用户手机：18879008955<text>待提货</text></view>
+				<view class="header">用户手机：{{item.customerPhone}}<text>{{item.statusMerge}}</text></view>
 				<view class="introduce">
-					<image></image>
-					<view>康师傅方便面 经典红烧牛肉面*5+番茄鸡蛋牛肉*1</view>
-					<view>规格：默认</view>
-					<view>￥120.61 X1</view>
-					<view>共1件商品已支付积分：20000</view>
+					<image :src="item.oderDetailImg"></image>
+					<view>{{item.productName}}</view>
+					<view>规格：{{handler(item.attributeJson)}}</view>
+					<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
+					<view>共{{item.orderNum}}件商品已支付积分：{{item.payIntegral}}</view>
 				</view>
 				<view class="footer">
-					提货码：1899
-					<view class="button" @click="determine">确定提货</view>
+					提货码：{{item.takeCode}}
+					<view class="button" v-if="item.statusMerge=='待核销'" @click="determine">确定提货</view>
 				</view>
 			</view>
 		</scroll-view>
@@ -48,7 +48,7 @@
 				<view class="title">是否立即提货</view>
 				<view class="buttons">
 					<view @click="$refs.popup.close()">取消</view>
-					<view>确认</view>
+					<view @click="submitFirm">确认</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-	import serve from '@/api/packageBill/push.js'
+	import serve from '@/api/packageIntegral/orderList.js'
 
 	export default {
 		options: {
@@ -66,9 +66,17 @@
 			return {
 				code: '',
 				controlWindows: {
-					code: false
+					code: true
 				},
-				dataList: [1]
+				paramter: {
+					currentPage: 1,
+					pagesize: 20,
+					params: {
+						takeCode: '',
+						customerPhone:''
+					},
+				},
+				dataList: []
 			}
 		},
 
@@ -78,9 +86,58 @@
 			determine() {
 				this.$refs.popup.open('center')
 			},
-		
+		handler(json) {
+			json = json.replace(/'/g, '"')
+			let res = JSON.parse(json)
+			let values = Object.values(res)
+			let text =values.reduce((prev,item,index) => {
+				let _text = `${index == 0 ? '' :','}${item}`
+				return prev += _text
+			},'')
+			return text
+		},
 			confirm() {
 				this.controlWindows.code = false
+				this.paramter.params.takeCode = this.code
+				this.paramter.params.customerPhone = this.code
+				this.getByPageCloudMini()
+			},
+			getByPageCloudMini() {
+				serve.getByPageCloudMini(this.paramter).then(res => {
+					if (res.code === 20000) {
+						if (!res.data.list.length) {
+							uni.showToast({
+								title: '没有更多订单啦~',
+								icon: 'none'
+							})
+							return
+						}
+						if (this.paramter.currentPage == 1) {
+							this.dataList = []
+						}
+						this.dataList = this.dataList.concat(res.data.list)
+						// console.log(this.dataList)
+					}
+				})
+			},
+			submitFirm(){
+				
+				let data = {}
+				data.id = this.dataList[0].orderId
+				data.takeCode = this.dataList[0].takeCode
+				serve.takeOrder(data).then(res => {
+					if (res.code === 20000) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+						this.$refs.popup.close();
+						uni.navigateTo({
+							url: '/packageIntegral/orderDetails/index'
+						})
+					}
+				})
+				
 			}
 		}
 	}