From dbbd64269f307033a3ff2b9e78a2fbc2eb4a89f3 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Thu, 20 Aug 2020 14:46:57 +0800
Subject: [PATCH] fixing bung

---
 pageC/components/merchant/list-item.vue |  10 ++++++++++
 pageC/components/merchant/video-top.vue |  10 ++++++++++
 pageE/static/mine/38.png                | Bin 0 -> 1591 bytes
 pages/mine/index.vue                    |   4 ++--
 static/image/mine/40.png                | Bin 0 -> 1591 bytes
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 pageE/static/mine/38.png
 create mode 100644 static/image/mine/40.png

diff --git a/pageC/components/merchant/list-item.vue b/pageC/components/merchant/list-item.vue
index 192f51b..fda4ffc 100644
--- a/pageC/components/merchant/list-item.vue
+++ b/pageC/components/merchant/list-item.vue
@@ -3,6 +3,7 @@
         <!-- <video  :src="url" :show-fullscreen-btn="true"></video> -->
 		<view v-if="type == '2'" class="video-container">
 			<image :src="url" mode="aspectFill" class="video"></image>
+			<view class="backs"></view>
 			<image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
 		</view>
         <image v-else :src="url" mode="aspectFill"></image>
@@ -27,6 +28,15 @@
 			width: 100%;
         	height: 100%;
 		}
+		.backs {
+			width: 100%;
+        	height: 100%;
+			position: absolute;
+			top: 0;
+			right: 0;
+			background-color: rgba($color: #000000, $alpha: 0.35);
+			z-index: 9;
+		}
 		.play-video {
 			position: absolute;
 			width: 100rpx;
diff --git a/pageC/components/merchant/video-top.vue b/pageC/components/merchant/video-top.vue
index 47f3702..a9e4556 100644
--- a/pageC/components/merchant/video-top.vue
+++ b/pageC/components/merchant/video-top.vue
@@ -1,6 +1,7 @@
 <template>
     <view class="videoTop">
 		  <image :src="url" mode="aspectFill" class="video"></image>
+		  <view class="backs"></view>
 		  <image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
     </view>
 </template>
@@ -16,6 +17,15 @@
         height: 100%;
 		z-index: 9;
     }
+	.backs {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.35);
+		z-index: 9;
+	}
 	.play-video {
 		position: absolute;
 		width: 100rpx;
diff --git a/pageE/static/mine/38.png b/pageE/static/mine/38.png
new file mode 100644
index 0000000000000000000000000000000000000000..c33d20181d83a39815709a032a800a2543fa964e
GIT binary patch
literal 1591
zcmah}X>1f_7~ZA@v1uEiPy}rlry7uUcaA-}Gju7lJG-#J*0Npb8bCXp`PvTMIXW|S
zx2tl9<%%2u1Q8<2A(kQ*izWs_!3u<+MC4YBi2cFki4g08I8)jMV~LYYz9Y}`zR!Do
zOG-;7WTuZuH<?VC{)u!@U-R`pZ$N+JChNur`Z8SehP5)ON{ccIFj1UT2_V0~RD&R3
zxQ4o;pvYuOy~c;aS~xI;WF^7E7#K@Tkaf1nR8$<38MYQ^P$j75MHl?b-ZmKGITu`R
z51;|r18Vq*aRrpcOG0eCmL)j2cpOv|BXt7;&=@EtL`0R0x!`WQq`o(<5g6)*Xtgf*
zo~Ur36!J(4fb15BnZ;~&sF1K=4y%nI3LqTCoCxYfFsm7JkT#UWaj55mb#Dq+MFweK
zk1ze?f@?HQCJ`hWjas5si=<Q|7(oySiX%8~))8j4LDZO-Syc0SEzm$^6<*eONrViG
zOr=z>xnN!Cy$}RBX;xHw(xfL0i7_&QSx_USZXm}dadN#9>2}Vs2#5dyh?=Tnu_RW{
zQXr6o_i0uTl4w;6g8Q-ciB>}mGC+brmFg8%FLG6$AxkDb3Scxz2}x3<H{+!>k|wD&
zk_>q~MurJ!bU80_QdE8B0S=%U4Y*(&#ZfcrG~;Lp!$`Z8w4?c`lSI*b(1678RSo}z
z+DNOFv^xI<)yvN@8uPzkjwP!kMPT$A@J7cXvRK{iEf666qN*_>3;eVT*2A;#JV#<S
zA7w>RhZm=O80MwiPCG%_2{(nIKHA~1_i|~8tv4#s%jNEK3m?igdfKQJNdtv{5pX_5
z5}@vSkbECnoDMgR6PV456NI6Kau7bsjk%qKgD$kYX}E{W^`WJQYkw#g(ZwJ}hd$7;
zy;u4e7~ACh>4)S515qDaMW4^72QEBmGNoMd(^M$-&Gk3ikThz@k?*6?L$d}_6Wn>X
zQx;Ehdz(W1XnOOBCnhxpVRuvZGWV!K+rHlPj&t42&CsgV7w3F=BX<{6_g%+@w`ZMS
zx9^p`>fY8(>o;^A-_R)DT#RjdZqUvX+h2R+(RH)N9{6GM!Hw}T_^3-8C&vWe=`UhJ
zm~PmTSle&GU?ug}%V^fbv?<fZny)w0?Z4-oq0^@4E?MbKKhyl%{>S4@{R-OmS1hYI
zI><Hq#Op6?qjPN;*Ty5ECr3QhnTUlFyYlZaDK}@oe`VDo>wu+{`Ou%GThr=>-Cllv
z>h!g%#wTu#+(Bg|&XO~B#!8p9W*2mQoA&q6oUd}XoZG&&v*Akrv>7=y!~BKseiVG8
zu`9BCck>P<#h-q#HviPTmOB~e#}pTz-rRaB+`)Pq=hbEZkvX@0{F;Py{poOK<+;ah
z-ED{Aoh>atP4#CMTvtQB`KfiEw66@GJrKW4?LKz1Z9)05!N;ZNqf?ZUik7U^S3kaz
z(IJCF1D~DQ^kH+R^z)XH>U+!Qv<}}_-BmPh@S6CkMJq-Zo_z}(E}vJ|*4aM??WnkR
z(x-hkbmonhJIlIKj~zMpSH|aevp!u<Cb;?eBk2p&G;JexvY<XPBGPZvgp2;eWw(CZ
gvtsVm882m5n2HOQE*j$5<1wCczqf?m<*s=3ACQ_j9RL6T

literal 0
HcmV?d00001

diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 15bfc0f..046f4d4 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -179,7 +179,7 @@ export default {
 				{
 					name: 'wait_evaluation',
 					title: '待评价',
-					img: '/static/image/mine/3.png',
+					img: '/static/image/mine/40.png',
 					link: '/order/Index?current=6',
 					number: '',
 				},
@@ -441,7 +441,7 @@ export default {
 					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+					@include image-size($image-width: 43rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(6){
 					@include image-size($image-width: 33rpx, $image-height: 35rpx);
diff --git a/static/image/mine/40.png b/static/image/mine/40.png
new file mode 100644
index 0000000000000000000000000000000000000000..c33d20181d83a39815709a032a800a2543fa964e
GIT binary patch
literal 1591
zcmah}X>1f_7~ZA@v1uEiPy}rlry7uUcaA-}Gju7lJG-#J*0Npb8bCXp`PvTMIXW|S
zx2tl9<%%2u1Q8<2A(kQ*izWs_!3u<+MC4YBi2cFki4g08I8)jMV~LYYz9Y}`zR!Do
zOG-;7WTuZuH<?VC{)u!@U-R`pZ$N+JChNur`Z8SehP5)ON{ccIFj1UT2_V0~RD&R3
zxQ4o;pvYuOy~c;aS~xI;WF^7E7#K@Tkaf1nR8$<38MYQ^P$j75MHl?b-ZmKGITu`R
z51;|r18Vq*aRrpcOG0eCmL)j2cpOv|BXt7;&=@EtL`0R0x!`WQq`o(<5g6)*Xtgf*
zo~Ur36!J(4fb15BnZ;~&sF1K=4y%nI3LqTCoCxYfFsm7JkT#UWaj55mb#Dq+MFweK
zk1ze?f@?HQCJ`hWjas5si=<Q|7(oySiX%8~))8j4LDZO-Syc0SEzm$^6<*eONrViG
zOr=z>xnN!Cy$}RBX;xHw(xfL0i7_&QSx_USZXm}dadN#9>2}Vs2#5dyh?=Tnu_RW{
zQXr6o_i0uTl4w;6g8Q-ciB>}mGC+brmFg8%FLG6$AxkDb3Scxz2}x3<H{+!>k|wD&
zk_>q~MurJ!bU80_QdE8B0S=%U4Y*(&#ZfcrG~;Lp!$`Z8w4?c`lSI*b(1678RSo}z
z+DNOFv^xI<)yvN@8uPzkjwP!kMPT$A@J7cXvRK{iEf666qN*_>3;eVT*2A;#JV#<S
zA7w>RhZm=O80MwiPCG%_2{(nIKHA~1_i|~8tv4#s%jNEK3m?igdfKQJNdtv{5pX_5
z5}@vSkbECnoDMgR6PV456NI6Kau7bsjk%qKgD$kYX}E{W^`WJQYkw#g(ZwJ}hd$7;
zy;u4e7~ACh>4)S515qDaMW4^72QEBmGNoMd(^M$-&Gk3ikThz@k?*6?L$d}_6Wn>X
zQx;Ehdz(W1XnOOBCnhxpVRuvZGWV!K+rHlPj&t42&CsgV7w3F=BX<{6_g%+@w`ZMS
zx9^p`>fY8(>o;^A-_R)DT#RjdZqUvX+h2R+(RH)N9{6GM!Hw}T_^3-8C&vWe=`UhJ
zm~PmTSle&GU?ug}%V^fbv?<fZny)w0?Z4-oq0^@4E?MbKKhyl%{>S4@{R-OmS1hYI
zI><Hq#Op6?qjPN;*Ty5ECr3QhnTUlFyYlZaDK}@oe`VDo>wu+{`Ou%GThr=>-Cllv
z>h!g%#wTu#+(Bg|&XO~B#!8p9W*2mQoA&q6oUd}XoZG&&v*Akrv>7=y!~BKseiVG8
zu`9BCck>P<#h-q#HviPTmOB~e#}pTz-rRaB+`)Pq=hbEZkvX@0{F;Py{poOK<+;ah
z-ED{Aoh>atP4#CMTvtQB`KfiEw66@GJrKW4?LKz1Z9)05!N;ZNqf?ZUik7U^S3kaz
z(IJCF1D~DQ^kH+R^z)XH>U+!Qv<}}_-BmPh@S6CkMJq-Zo_z}(E}vJ|*4aM??WnkR
z(x-hkbmonhJIlIKj~zMpSH|aevp!u<Cb;?eBk2p&G;JexvY<XPBGPZvgp2;eWw(CZ
gvtsVm882m5n2HOQE*j$5<1wCczqf?m<*s=3ACQ_j9RL6T

literal 0
HcmV?d00001