5.7

commit.csv

@@ -1,3 +1,4 @@
+2021-04-09,17:34:53,4-09,24,14
 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

packageA/goodsCart/index.vue

@@ -278,8 +278,9 @@
 					}
 					let preViewMsg = res.data.data
 					this.$store.commit('updatePreOrderMsg',preViewMsg);
+					// pages/confirmOrder/confirmOrder
 					uni.navigateTo({
-						url: "../confirmOrder/confirmOrder"
+						url: "/pages/confirmOrder/confirmOrder"
 					})
 				});
 

packageA/myShop/teamAdd.vue

@@ -24,6 +24,7 @@
 			return {
 				current: 0,
 				imgUrlArr:[],
+				imgUrl:'',
 				invitationNo:this.$store.state.invitationNo
 			}
 		},
@@ -33,7 +34,9 @@
 		},
 		methods: {
 			changeCurrent(e) {
-				this.current = e.detail.current
+				this.current = e.detail.current
+			
+				console.log(e)
 			},
 			getData(){
 				this.$u.get(`/api/v1/shop/share_photo/${this.invitationNo}`).then(res => {
@@ -84,14 +87,15 @@
 				})
 			},
 			//保存图片到相册，提示保存成功
-			savePhoto() {
-				let that = this
+			savePhoto() {
+				let  imgUrl = this.imgUrlArr[this.current]
 				wx.downloadFile({
-					url: that.imgUrl,
+					url:imgUrl,
 					success: function(res) {
 						wx.saveImageToPhotosAlbum({
 							filePath: res.tempFilePath,
-							success(res) {
+							success(res) {
+								console.log(res.tempFilePath)
 								wx.showToast({
 									title: '保存成功',
 									icon: "success",

pages/find/find.vue

@@ -13,13 +13,13 @@
 
 			<swiper class="flex-sub" :current="currentIndex" :duration="300" :indicator-dots="false" :autoplay="false" @change="changeCurrent">
 				<!-- 直播回放列表 -->
-			<!-- 	<swiper-item>
+				<swiper-item>
 					<live-videos></live-videos>
-				</swiper-item> -->
+				</swiper-item>
 				<!-- 小视频列表 -->
-		<!-- 		<swiper-item>
+				<swiper-item>
 					<small-videos></small-videos>
-				</swiper-item> -->
+				</swiper-item>
 				<!-- 图文动态列表 -->
 				<swiper-item>
 					<dynamics :showGoodsLink="true"></dynamics>
@@ -30,8 +30,8 @@
 </template>
 
 <script>
-	// import liveVideos from 'components/liveVideos.vue'
-	// import smallVideos from 'components/smallVideos.vue'
+	import liveVideos from 'components/liveVideos.vue'
+	import smallVideos from 'components/smallVideos.vue'
 	import dynamics from 'components/dynamics.vue'
 	export default {
 		data() {
@@ -39,12 +39,12 @@
 				showMybtn: false,
 				currentIndex: 0,
 				list: [
-					// {
-					// 	name: '直播'
-					// },
-					// {
-					// 	name: '视频'
-					// },
+					{
+						name: '直播'
+					},
+					{
+						name: '视频'
+					},
 					{
 						name: '图文'
 					}
@@ -52,8 +52,8 @@
 			};
 		},
 		components: {
-			// liveVideos,
-			// smallVideos,
+			liveVideos,
+			smallVideos,
 			dynamics
 		},
 		onLoad() {

pages/goodsDetail/goodsDetail.vue

@@ -606,7 +606,8 @@
 				this.showSpecs = flag
 			},
 			// 获取商品详情信息
-			getGoodsDetail() {
+			getGoodsDetail() {
+				
 				this.$u.post('/api/v1/goods/detail/summary', {
 					userID: uni.getStorageSync("userInfo").id,
 					GoodsID: this.id
@@ -617,14 +618,26 @@
 						this.$u.toast(res.data.msg);
 						return
 					}
-					this.goodsDetail = res.data.data
+					this.goodsDetail = res.data.data
+					// 商样图片  根据type判断放在什么位置
+					if(res.data.data.notice.type === 1){
+						this.brandFirstImg = res.data.data.notice.img
+						this.brandLastImg = ''
+					}else if(res.data.data.notice.type === 2){
+						this.brandFirstImg =  ''
+						this.brandLastImg =  res.data.data.notice.img
+					}else{
+						this.brandFirstImg = res.data.data.notice.img
+						this.brandLastImg =  res.data.data.notice.img
+					}
 					// 规格只有一个 默认选中
 					if (this.goodsDetail.attributes.length === 1 && this.goodsDetail.attributes[0].children.length === 1) {
 						this.selectName[0] = this.goodsDetail.attributes[0].children[0].name
 						this.selectArr[0] = this.goodsDetail.attributes[0].children[0].id
 						this.subIndex[0] = 0
 					}
-					console.log(res.data.data)
+					console.log(res.data.data)
+					
 					this.swiperImgList = res.data.data.mainPhotos
 
 					//获取商品详情图片列表
@@ -664,14 +677,10 @@
 					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
-				});
+				});
+			
 			},
 
 

pages/livePlayback/livePlayback.vue

@@ -26,7 +26,7 @@
 				<view class="text-center goods-num">{{videoDetail.goodsLists.length}}</view>
 			</view>
 		</view>
-		<u-popup v-model="isShow" mode="bottom" border-radius="20">
+		<u-popup v-model="isShow" mode="bottom" border-radius="20" height="60%">
 			<view class="goods-container">
 				<view class="item" v-for="(item,index) in videoDetail.goodsLists" :key="index">
 					<view class="item-con flex justify-between">
@@ -76,13 +76,29 @@
 				isLive:0, //是否是直播
 			};
 		},
+		onHide() {
+			console.log('21333333333333333')
+		},
 		onLoad(options) {
 			console.log(options)
 			if (options.id) {
 				this.id = parseInt(options.id)
 				this.isLive = parseInt(options.isLive)
+				if(this.isLive){
+					wx.enableAlertBeforeUnload({
+					      message: "是否确认离开直播间？",
+					      success: function (res) {
+					        console.log("方法注册成功：", res);
+					      },
+					      fail: function (errMsg) {
+					        console.log("方法注册失败：", errMsg);
+					      },
+					    });
+				}
 				this.getDetail()
 			}
+			
+	
 		},
 		methods: {
 			getDetail() {
@@ -140,7 +156,7 @@
 					this.$set(this.videoDetail,'isFollow', 1 )
 				});
 			}
-		}
+		},
 	}
 </script>
 

pages/poster/poster.vue

@@ -53,7 +53,8 @@
 					'https://testcdn.reecook.cn/static/photo/0a8c3159cf4a6cfe2475e6837a5b3521.jpg')
 
 				this.ctx.drawImage(headerImg.path, this.canvasW * 0.1, this.convert_length(20) + 60, this.canvasW * 0.8, this.canvasW *
-					0.8 * 0.8);
+					0.8 * 0.8);
+					
 				//绘制标题
 				// this.ctx.setFontSize(this.convert_length(34)); //设置标题字体大小
 				// this.ctx.setFillStyle('#333'); //设置标题文本颜色