From fe8af80983cc1276915e29c6a7d30136cb0b9471 Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Sun, 9 Aug 2020 11:31:47 +0800
Subject: [PATCH] gdpao

---
 common/http.interceptor.js                |   2 +-
 components/index/video-item/index.vue     |  16 +-
 components/informations/notice/notice.vue |  12 +-
 pageB/components/nuserinfo/nuserinfo.nvue |  22 +++
 pageB/photo/index.vue                     |  15 +-
 pageB/video/video.nvue                    | 207 ++++++++++++++++++++++
 pageD/activity/activity.vue               |   4 +-
 pageD/notice/info.vue                     |  70 ++++++++
 pageD/notice/notice.vue                   |   4 +-
 pages.json                                |  23 ++-
 pages/shop/index.vue                      |  30 +++-
 static/videoPlay.png                      | Bin 0 -> 2345 bytes
 12 files changed, 385 insertions(+), 20 deletions(-)
 create mode 100644 pageB/components/nuserinfo/nuserinfo.nvue
 create mode 100644 pageB/video/video.nvue
 create mode 100644 pageD/notice/info.vue
 create mode 100644 static/videoPlay.png

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 75c6d58..6ca6879 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -69,7 +69,7 @@ const install = (Vue, vm) => {
             return false;
         } else if (res.errCode == 1) {
             console.log(res.message);
-            return res;
+            return res.data;
         } else {
             // 如果返回false，则会调用Promise的reject回调，
             // 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值
diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index 9e45136..3f694aa 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="video-item" v-if="item" @click="toDetailsPage(item.article_id)">
+    <view class="video-item" v-if="item" @click="toDetailsPage(item.article_id,item.video_path)">
         <image class="head" :src="item.article_pic" v-if="item.type == 1" ></image>
 		<view class="header_fist"  v-else>
 			<view class="backes"></view>
@@ -245,10 +245,16 @@ export default {
 				}
 			})
 		},
-		toDetailsPage(id) {
-			 uni.navigateTo({
-				url: '/pageB/photo/index?id=' + id
-			});
+		toDetailsPage(id,type) {
+            if (type) {
+                uni.navigateTo({
+                	url: '/pageB/video/video?id=' + id
+                });
+            } else {
+                 uni.navigateTo({
+                	url: '/pageB/photo/index?id=' + id
+                });
+            }
 		},
 	},
 }
diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue
index c54e18b..b212e45 100644
--- a/components/informations/notice/notice.vue
+++ b/components/informations/notice/notice.vue
@@ -5,7 +5,7 @@
 			<view class="notice_view">
 				<image :src="item.picture" mode="aspectFill" ></image>
 				<view class="text_view u-line-2">{{ item.content }}</view>
-				<view class="notice_list">
+				<view class="notice_list" @click="gotoInfo(index)">
 					<text>查看详情</text>
 					<u-icon name="arrow-right" color="#666"></u-icon>
 				</view>
@@ -87,7 +87,15 @@
             }
         },
         methods: {
-            
+            gotoInfo(index) {
+                console.log(index);
+                this.$u.route({
+                    url: "/pageD/notice/info",
+                    params: {
+                        index: index
+                    },
+                })
+            }
         }
 	}
 </script>
diff --git a/pageB/components/nuserinfo/nuserinfo.nvue b/pageB/components/nuserinfo/nuserinfo.nvue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pageB/components/nuserinfo/nuserinfo.nvue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index f691395..7a9d331 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -58,7 +58,7 @@
                 <view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view>
 				<u-loadmore v-else :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
 			</scroll-view>
-			<view class="editing" @click="openKeyInput">
+			<view class="editing" @touchend.prevent="openKeyInput">
 				<input type="text" value="" :placeholder="edit_text" disabled="disabled" />
 				<text>发送</text>
 			</view>
@@ -66,7 +66,7 @@
 		<!-- 评论box -->
 		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
 			<view class="edit-box">
-				<input type="text" :placeholder="edit_text_other" :focus="is_focus" @focus="focus" v-model="send_value" autofocus>
+				<input type="text" :focus="is_focus" :placeholder="edit_text_other" @focus="focus" v-model="send_value">
 				<text @click="sendComment">发送</text>
 			</view>
 		</u-popup>
@@ -437,10 +437,10 @@ export default {
     onBackPress() {
         if (this.cart_type) {
             this.cart_type = !this.cart_type;
-        } else if (this.is_comment) {
-            this.is_comment = !this.is_comment;
         } else if (this.is_edit) {
             this.is_edit = !this.is_edit;
+        } else if (this.is_comment) {
+            this.is_comment = !this.is_comment;
         } else {
             return false;
         }
@@ -495,9 +495,11 @@ export default {
 		},
 		// 打开评论输入
 		openKeyInput(data,index) {
-			console.log(data);
+			// console.log(data);
 			this.is_edit = true;
-			this.is_focus = true;
+            setTimeout(() => {
+                this.is_focus = true;
+            }, 200)
             this.comment_id = index;
             if (data.id) {
                 this.edit_text_other = "回复@" + data.member_nickname;
@@ -520,6 +522,7 @@ export default {
 			}).then(res => {
 				// console.log(res.data.data);
 				if (res.errCode == 0) {
+                    this.send_value = "";
                     this.comment_num = res.data.num;
                     // console.log(this.comment_num);
 					this.is_edit = false;
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
new file mode 100644
index 0000000..6737a1d
--- /dev/null
+++ b/pageB/video/video.nvue
@@ -0,0 +1,207 @@
+<template>
+    <view>
+        <video id="videoId" :style="videoSize" :src="src" autoplay="true" :loop="true" :show-fullscreen-btn="false" @play="playing"
+            :show-play-btn="false" controls="false" @click="stoping" :enable-progress-gesture="false"></video>
+        <cover-image class="close" @click="goBack" src="../../static/close.png">
+        </cover-image>
+        <cover-view class="" src="../../static/videoPlay.png">
+        </cover-view>
+        <cover-view class="info-box">
+            <view class="video-info-box">
+                <image class="image-play" src="../../static/videoPlay.png" mode=""></image>
+                <text class="video-slip">视频</text>
+                <text class="time">{{ time_count }}s</text>
+            </view>
+            <view>
+                <text class="name">@{{ list.member_nickname }}</text>
+            </view>
+            <view>
+                <text class="title">{{ list.article_title }}</text>
+            </view>
+            <view>
+                <text class="centent">{{ list.article_content }}</text>
+            </view>
+            <view class="label-box">
+                <block v-for="(item,index) in list.label" :key="index">
+                    <text class="label" :style="{ width: item.name.length * 40 + 'rpx' }">{{ item.name }}</text>
+                </block>
+            </view>
+        </cover-view>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                videoSize: {},
+                list: {},
+                src: "",
+                is_play: true,
+                timer: null,
+                alltime: 7,
+                time_count: 7,
+            };
+        },
+        onLoad(option) {
+            this.getVideoInfo(option.id);
+            this.getInfo();
+            this.aaa();
+        },
+        onReady() {
+            this.videoBox = uni.createVideoContext("videoId", this);
+        },
+        methods: {
+            // 获取信息
+            getVideoInfo(article_id) {
+                uni.request({
+                    url: "https://dmmall.sdbairui.com/api/article/articleInfo",
+                    method: "POST",
+                    data: {
+                        article_id: article_id
+                    },
+                    success: (res) => {
+                        this.list = res.data.data.info;
+                        this.src = res.data.data.info.video_path;
+                    }
+                })
+            },
+            // 获取手机信息
+            getInfo() {
+                uni.getSystemInfo({
+                    success: (res) => {
+                        this.videoSize = {
+                            width: "750rpx",
+                            height: res.screenHeight + "px"
+                        }
+                    }
+                })
+            },
+            // 播放
+            playing(e) {
+                console.log(e);
+                if (e.type == "play") {
+                    this.alltime = 7;
+                    this.time_count = 7;
+                    this.aaa();
+                }
+            },
+            // 暂停
+            stoping() {
+                this.is_play = !this.is_play;
+                if (this.is_play) {
+                    this.videoBox.play();
+                    this.aaa();
+                } else {
+                    this.videoBox.pause();
+                     clearInterval(this.timer);
+                     this.temp_time = this.time_count;
+                     console.log(this.temp_time);
+                }
+            },
+            // 倒计时
+            aaa() {
+                this.timer = setInterval(() => {
+                    if (this.time_count > 0 && this.time_count <= this.alltime) {
+                        this.time_count--;
+                    } else {
+                        clearInterval(this.timer);
+                        this.timer = null;
+                    }
+                }, 1000);
+            },
+            goBack() {
+                uni.navigateBack({
+                    delta: 1
+                })
+            }
+        }
+    }
+</script>
+
+<style>
+    /* 关闭 */
+    .close {
+        position: fixed;
+        top: 80rpx;
+        right: 60rpx;
+        width: 30rpx;
+        height: 30rpx;
+    }
+
+    /* 底部信息 */
+    .info-box {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        padding: 30rpx;
+    }
+
+    .video-info-box {
+        flex-direction: row;
+        align-items: center;
+        width: 160rpx;
+        height: 40rpx;
+        padding: 4rpx 10rpx;
+        margin-bottom: 20rpx;
+        color: #666666;
+        border-radius: 10rpx;
+        background-color: rgba(255, 255, 255, .6);
+    }
+
+    .image-play {
+        width: 22rpx;
+        height: 20rpx;
+        margin-right: 10rpx;
+    }
+
+    .video-slip {
+        color: #666;
+        font-size: 24rpx;
+        margin-right: 20rpx;
+    }
+
+    .time {
+        color: #666;
+        font-size: 24rpx;
+    }
+
+    .name {
+        color: #fff;
+        font-size: 36rpx;
+        margin-bottom: 20rpx;
+    }
+
+    .title {
+        color: #fff;
+        font-size: 26rpx;
+        margin-bottom: 20rpx;
+    }
+
+    .centent {
+        width: 500rpx;
+        color: #fff;
+        font-size: 28rpx;
+        margin-bottom: 20rpx;
+        lines: 2;
+        text-overflow: ellipsis;
+    }
+
+    .label-box {
+        flex-direction: row;
+    }
+
+    .label {
+        lines: 3;
+        width: 100rpx;
+        height: 40rpx;
+        padding: 4rpx 10rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+        font-size: 26rpx;
+        text-align: center;
+        color: #666666;
+        border-radius: 10rpx;
+        background-color: rgba(255, 255, 255, .6);
+    }
+</style>
diff --git a/pageD/activity/activity.vue b/pageD/activity/activity.vue
index d0dfcf2..113f489 100644
--- a/pageD/activity/activity.vue
+++ b/pageD/activity/activity.vue
@@ -48,11 +48,13 @@
 </script>
 
 <style lang="scss" scoped>
+    page {
+        background-color: #ECECEC;
+    }
 	uni-page-body{
 		height: 100%;
 	}
 	#actives{
-			background: #ECECEC;
 			height: 100%;
             .time {
                 padding: 30rpx 0;
diff --git a/pageD/notice/info.vue b/pageD/notice/info.vue
new file mode 100644
index 0000000..fa7bb7a
--- /dev/null
+++ b/pageD/notice/info.vue
@@ -0,0 +1,70 @@
+<template>
+	<view>
+		<image :src="list.picture" class="picture" mode=""></image>
+        <view class="box">
+            <view class="info">
+                <text class="title u-line-2">{{ list.title }}</text>
+                <u-divider class="time">{{ list.addtime }}</u-divider>
+                <!-- <text class="time"></text> -->
+            </view>
+            <view class="content">{{ list.content }}</view>
+        </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				index: 0,
+                list: [],
+			};
+		},
+        onLoad(option) {
+            // console.log(option);
+            this.index = option.index;
+            // 获取数据
+            this.informationList();
+        },
+        methods: {
+            informationList(){
+            	this.$u.api.informationList({}).then((res)=>{
+                    if (res.errCode == 0) {
+                        this.list = res.data[this.index];
+                        console.log(this.list);
+                    }
+            	})
+            }
+        }
+	}
+</script>
+
+<style lang="scss">
+page {
+}
+.picture {
+    width: 100%;
+}
+.box {
+    width: 100%;
+    padding: 20rpx;
+    .info {
+        .title {
+            font-size: 38rpx;
+            color: rgba(0,0,0,.84);
+            line-height: 1.2;
+        }
+        .time {
+            padding: 40rpx 0;
+        }
+    }
+    .content {
+        padding: 0 6rpx;
+        font-size: 34rpx;
+        color: rgba(0,0,0,.6);
+        line-height: 1.4;
+        letter-spacing: 1rpx;
+        text-indent: 2rem;
+    }
+}
+</style>
diff --git a/pageD/notice/notice.vue b/pageD/notice/notice.vue
index 252302c..bf174db 100644
--- a/pageD/notice/notice.vue
+++ b/pageD/notice/notice.vue
@@ -21,7 +21,9 @@
 			},
 			informationList(){
 				this.$u.api.informationList({}).then((res)=>{
-                    this.list = res.data;
+                    if (res.errCode == 0) {
+                        this.list = res.data;
+                    }
 				})
 			}
 		},
diff --git a/pages.json b/pages.json
index e0be766..491ee31 100644
--- a/pages.json
+++ b/pages.json
@@ -103,6 +103,12 @@
 						}
 					}
 				},
+                {
+                    "path" : "video/video",
+                    "style" : {
+                        "navigationStyle":"custom"
+                    }
+                },
 				{
 					"path": "sdetails/index",
 					"style": {
@@ -481,7 +487,16 @@
 							}
 						}
 					}
-				}
+				},
+                {
+                    "path" : "notice/info",
+                    "style" : {
+                        "navigationBarTitleText":"公告详情",
+                        "titleNView": {
+                        	"backgroundColor": "#FFFFFF"
+                        }
+                    }
+                }
 			]
 		},
 		{
@@ -1050,7 +1065,11 @@
 				}
 			}
 		}
-	],
+        ,{
+            "path" : "pageB/components/nuserinfo/nuserinfo",
+            "style" : {}
+        }
+    ],
 	"tabBar": {
 		"color": "#999999",
 		"selectedColor": "#FF780F",
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 390d186..13e5b38 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -145,6 +145,8 @@
 								image: item.adv_code,
 								adv_link: item.adv_link,
 								adv_id: item.adv_id,
+                                info_id: item.info_id,
+                                url_type: item.url_type,
 							})
 						})
 						this.list = temp;
@@ -181,9 +183,33 @@
 				})
 			},
 			clickImage(index) {
-				console.log(index);
-				console.log(this.list[index]);
+				// console.log(this.list[index]);
+                let item = this.list[index];
+                this.activityLink({
+                	type: item.url_type,
+                	id: item.info_id,
+                });
 			},
+            activityLink({
+            	type,
+            	id
+            }) {
+                console.log(type,id);
+            	if (type == 0) return false;
+            	// type 1 商品详情页, 2 店铺详情页
+            	const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
+            	let params = {
+            		id: id
+            	};
+            	// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
+            	if (type == 1) Object.assign(params, {
+            		type: 1
+            	});
+            	this.$u.route({
+            		url: url,
+            		params: params
+            	})
+            },
 			// 下拉加载更多推荐商品
 			onreachBottom() {
 				this.$refs.recommendGoods.loadMore();
diff --git a/static/videoPlay.png b/static/videoPlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..d088e4f4b6dd190aa6d7760e29f53d6ad0e69306
GIT binary patch
literal 2345
zcmV+^3D)+BP)<h;3K|Lk000e1NJLTq007$n004jp1^@s6g326p000Q^Nkl<ZcwX(D
zTc{UR7{!0~WZ*-D4+%*nMNfrL551%*MA79Xh{z&H!IG@Jq*z|Mm>A@xL_-A$2{nXz
zFvE(3&<cEwQY$YInu=vemUNT&XigsVc+UK1_RQY<o3%lDI5Xd6t-YH0&#c*d7#i0B
z6M+fEe@7LNoB>V%M}W_PPk>#5O9)g&U|7`?9h^4>m=28Xp_gBPO~6~gz8=ogp+bNz
zitTP-4KSuA|C@msz{#3%bb3b+=$hCz0Fwi9`z!DQusUE&g>s5OSHyND@G)>}Lp<&U
zrs+3bL+CmQ+Xb<W0KNcjZh^CRfmy(@7IG;?W(agaZ1xoK&K7w&3oI%AwU}0^Qb)kM
z*q#C2j6}jgU?%WEr2I;o7y_QfHX8U27#<n(9mOk#Ly_xH`p5`)7Mr~fn-m$}zVv?r
zZvd|Vza>(W%4it@uVTBQxT>`b=aA{_!O8Q$#vzZ?0qzj+DmHsSVeh|E9eV(CuzZth
zfvPJ!0$#;tzmLrGnEF^({7>Oj>V>Ml`UrRw+sMo;R3@~Az*^v3eM%J}RRlbW?S5ce
zs(=qtm)%l6QM`c9uzZy~6apT__B60+sKyii`xaofTqp@MRIxOVVw(pnt%ye|r`hWP
zd&sj4_$!s7R7X7oJc{jQU{O6-k~#Y@@Eq`dG8L(i$_RKAo4q);2M(UbPGBk^7fQyg
zN^JR%XD*bLz+$;j@*%B%r4n0yy!{BwEtY4<ulf#GEV1QFzFa7oaVN25M%V@A+Dq{D
zz<fY1l*GA|*b*nGWO;I-lmsf~VG>(R^uy;i7m692?G{rbF$5&G#0Uvgj$9~#fD9Q%
zVhf38TCwCpNsAAci?n)tsa<E<94Ho({jg3Dom(FPUD@hmm`en?P$DxWu|+1J<@Dx4
zSy8x9es4K<=hI1S-JAmELYV{DegzsWAt14}1azWl<U(nY7>TV#uoF#XE)-h}Wr18M
z%`zmhHH&Xf(anWof-~W1EtCeBlh_&nHS>^ip)^FG#MTh74#L{Q6Z=YBJMsh~Q(_AQ
zq|-3Auehy+vRrGS)Mr>?tB+w9BG_^awk(6a7}uzXfW%f2xQ?D?mM`0eOKYK2m;e%6
z1<*Qvid-laCxFCO5jdU3(PAwWxll?@28pdCP&(|A2*`y}a&ky)C4tgmgCg)xu@;K$
zJ$G7I4UB-qrkN2Efu9Q(iY-DU7s>_5N^Bvgnqu`KAQ#F2b3tO0K$=8AE|h-gN^DI|
zHN`dr%!Tr5@zH9hcjS@SB#5>U=)4O>Vry%vDNi2)+kt1h=t7a$B!U<S{88Li+U;d$
z)<TikVoWvV>_gxna4+y}7a;K{HcvZ`c3}?M1C+afFTFP_v3X}WkN(VcavQKek8-P3
z=}~N25xLr2h<(;RU@Tx?6}TJ{n@d`=ZOXPVUX*S1LliEtd1W@wzU(RG7{C^hbvHbU
zO%F)&o~CaDlk;w2;Oae!O~2Xlo~eHWR|6;VZsX$WB{px2`sl|TCaZk3a=r_R%^RaW
z`q=^8<D(Uc%^Q#2`mtS8M|f*WS2k~q`srshaKukLXq#V8WIF3*Jh01CPr9;sV$)YI
z4*^>}wIs25V$)YIj{=)KwIs25V$)YI_W`!txtk%exuMcsBR2tGd+JJJ^Tei~UTk5Y
z;ojDsl-T@CP*0ug2F7`6$a<03yfNydA6v%!H6N{<??Php#%TWim=XCJkDu9i6q`P=
z$y;#m0FUL}!obyg6q`P=$#<sOgOTfjAM$PC(v?eW9$C$|CoPMR8F#v}Wky(0?pMGq
zfc<83IXqt3^qVcescKsWPXNBpuk`X2dlZ|lY~}e+;YeG;ZX$3zg<_hlL1JqXUBw;>
z0oye34&bMu4)pMMiOmCx`SoB6v918@frvKN$dAAOE7omf+T`s7rfSQmv`H#koy1la
zsdkS$0L<|A*-S4G>Nc_$v~+A01Z?ph+lOsAplyDuAeituy0WE1&K6)ca4emY;#Hz6
zTRiMNXSSz|Q-D35o9wkWiLF<}bo^iloB|dA>%4vV8G?3+Ed+{+aSm7y%m++x8Ur98
zv1wY=MZj(q?UvDQ9W@3)Kw{JMsEUB?p*9EDTs1(~&Xd@>#(4dH&Hb?wu&2JAaevf@
zO>2;Zz_3d(I_v%jL9(uFAyD)mqx0^M5EM&nAyD)iL++1&+)8W#!E_c%?vKEPN^F4v
zbr4SOkA_H;*ct*h!?1FHG)$Vr)-b>sgqQoHC6XkzmViz)jocqC5+kv-2zElL<o<|2
zhQt;D^oS|t{)h;^#1;|!mQ&09(K6r{rjytr6VO6>xj$L}xl9U)tqe+e9%Js0CBU+-
zul<n<eG*$LOoXjN?vJo|28kxI1%WY{AaZ{sL&e2~NNfp{(?e<I{#XdC)!H9Dpw{xC
z5?jlF2TmvVM_@pk3@5QQiEgv8<^E_E-{8?Dw&0L99?;w$bAe5bXHtTo2uN%};cPUR
z+#ij?+k9||t$B<?WRUwK1d5Skcof@9z>AS_4VC_IvGdEePyrPu9s(Z4Hmle%B_68v
zGt2!^AH(D#cof@YU_)|9moG@}kMdY$b)-kJ-45)^iiQ7*mHQ(@(t0V`qu4G7&H$J7
z0z|}P<^G5Wew(R1ip}u*3>e=gkQH;S0TyZJmx}0RcA8hQ*#_yhM_8&u?vGTNX|OJ@
zV!NW)T6TDY*i{LA9GC}eta7r>$r}N$Vl!53!*qKMkiwArBLx;B*Wg)fR{@6rdtefC
zd<0Af4#q4(x#J_?S!{;x1HgNcV79eCW&+zI<yYFo5b!Rx7`KyWfyKbm#JE;DkrC*E
z*sMqU9OdB_u$KFy1(0)1(FL*fakCnDsv)BG0#5?F8;Y;64iM;)*o>~n0eg`g>Y>SL
zU;$u4)(`@NBG5Il85pC0*MUjY+f#gN@s#nT=9myDgFqL>)`!cDz%<|yU}PDviev0i
zzI`)iE)WeNP#S?Qi>*IM4+7(WYy17Pzn=h(0{aVB{-=QbKGP5aJtOcht0b6^og<7?
P00000NkvXXu0mjf9w<sW

literal 0
HcmV?d00001

-- 
2.45.2