From c5d3825e99cc76a75cdc8ad99c8f001583be7571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=92=BB=E9=A3=8E?= <1090115880@qq.com>
Date: Fri, 9 Apr 2021 17:34:53 +0800
Subject: [PATCH] 4-09

---
 commit.csv                          |  1 +
 pages/confirmOrder/confirmOrder.vue | 11 ++++-------
 pages/goodsDetail/goodsDetail.vue   | 26 +++++++++++++++++++-------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/commit.csv b/commit.csv
index d677369..72523a6 100644
--- a/commit.csv
+++ b/commit.csv
@@ -1,3 +1,4 @@
+2021-04-08,16:37:34,recook4.08,397,305
 2021-03-31,18:05:16,3-31,39,27
 2021-03-30,17:45:05,3-30,189,161
 2021-03-29,20:26:56,3-29,932,416
diff --git a/pages/confirmOrder/confirmOrder.vue b/pages/confirmOrder/confirmOrder.vue
index a3aeb60..0b0b404 100644
--- a/pages/confirmOrder/confirmOrder.vue
+++ b/pages/confirmOrder/confirmOrder.vue
@@ -150,11 +150,10 @@
 			}
 		},
 		onShow() {
-			let realInfoStatus = uni.getStorageSync("userInfo").realInfoStatus
-
+			let realInfoStatus = uni.getStorageSync("userInfo").realInfoStatus
+			console.log(realInfoStatus)
 			if (!realInfoStatus) {
 				// 未实名认证 判断是否需要实名认证
-
 				let newArr = [];
 				// 循环过滤
 				this.$store.state.preOrderMsg.brands.forEach((value, index) => {
@@ -173,7 +172,7 @@
 				this.RealList = newArr
 			} else {
 				// 已实名认证
-				this.tipsShow = true
+				this.tipsShow = false
 			}
 		},
 		methods: {
@@ -221,7 +220,6 @@
 			submitOrder() {
 				let submitBool = true
 				let realInfoStatus = uni.getStorageSync("userInfo").realInfoStatus
-				
 				if (!realInfoStatus) {
 					// 用户未实名认证
 					this.RealList.map(item => {
@@ -230,8 +228,7 @@
 							submitBool = false
 						}
 					})
-				}
-				
+				}
 				if (!submitBool) {
 					// 未实名认证 并且商品包含国内仓商品和无 
 					this.$u.toast('请先实名认证', 2000);
diff --git a/pages/goodsDetail/goodsDetail.vue b/pages/goodsDetail/goodsDetail.vue
index c9e9666..4a73bb3 100644
--- a/pages/goodsDetail/goodsDetail.vue
+++ b/pages/goodsDetail/goodsDetail.vue
@@ -274,10 +274,18 @@
 										<view class="text-black" style="line-height: 80rpx;font-size: 28rpx;padding: 0 20rpx;">图文详情</view>
 										<view class="video" v-if="goodsDetail.video">
 											<video :src="IMAGE_URL+goodsDetail.video.url" style="width: 100%;display: block;" controls></video>
-										</view>
+										</view>
+										 <view class="detail-pics  brandFirstImg" v-if="brandFirstImg">
+										 	<u-lazy-load threshold="-100" :image="IMAGE_URL+brandFirstImg" 
+										 	 :index="index" :loading-img="IMAGE_URL + '/null05.png'"  :error-img="IMAGE_URL + '/null05.png'" ></u-lazy-load>
+										 </view>
 										<view class="detail-pics">
 											<u-lazy-load threshold="-100" :image="IMAGE_URL+item.url" v-for="(item,index) in pictures" :key="index"
 											 :index="index" :loading-img="IMAGE_URL + '/null05.png'"  :error-img="IMAGE_URL + '/null05.png'" ></u-lazy-load>
+										</view>
+										<view class="detail-pics brandLastImg" v-if="brandLastImg">
+											<u-lazy-load threshold="-100" :image="IMAGE_URL+brandLastImg" 
+											 :index="index" :loading-img="IMAGE_URL + '/null05.png'"  :error-img="IMAGE_URL + '/null05.png'" ></u-lazy-load>
 										</view>
 									</view>
 								</view>
@@ -492,7 +500,9 @@
 				dynamics: [], //动态列表,
 				showBtn: false, //是否显示发布按钮
 				addressList: [],
-				address: null
+				address: null,
+				brandFirstImg:'',//图文详情第一张图片
+				brandLastImg:'',//图文详情最后一张图片
 			}
 		},
 		components: {
@@ -504,9 +514,7 @@
 			} else {
 				this.isLogin = false
 			}
-			console.log(options)
-			console.log('1234565')
-			console.log(options.invite)
+		
 			if(options.invite){
 				this.$store.commit('setinvite', options.invite);
 			}
@@ -524,7 +532,6 @@
 				this.showBtn = true
 			}
 			this.id = parseInt(options.id)
-			console.log(this.id + '-------')
 			this.getGoodsDetail()
 		},
 		computed: {
@@ -657,7 +664,12 @@
 					if (res.data.code == "FAIL") {
 						this.$u.toast(res.data.msg);
 						return
-					}
+					}
+					// firstImg lastImg
+					this.brandFirstImg = res.data.data.brand.firstImg
+					this.brandLastImg = res.data.data.brand.lastImg
+					console.log(this.brandFirstImg ,
+this.brandLastImg)
 					this.pictures = res.data.data.list
 				});
 			},