提交页面

components/common/u-swiper/index.vue

@@ -36,7 +36,8 @@
 		</view>
 		<van-overlay :show="showOverlay" @tap="onClickHideOverlay">
 			<view class="overlay-wrapper">
-				<video v-if="videoUrl" :src="videoUrl" controls autoplay loop @tap.stop></video>
+        <view class="iconfont icon-Cancel"></view>
+        <video v-if="videoUrl" :src="videoUrl" controls autoplay loop @tap.stop></video>
 			</view>
 		</van-overlay>
 	</view>
@@ -140,7 +141,7 @@
 				current: 0,
 				logoPage: 1,
 				logoList: [],
-				limit: 6
+				limit: 4
 			}
 		},
 		created() {},
@@ -221,7 +222,14 @@
 	.overlay-wrapper {
 		@include display-flex-center;
 		height: 100%;
-
+    .iconfont {
+      color: #ffffff;
+      font-size: 86rpx;
+      position: absolute;
+      right: 20rpx;
+      top: 30%;
+      z-index: 9;
+    }
 		video {
 			width: 100%;
 		}

pages.json

@@ -57,7 +57,7 @@
 		"list": [
 			{
 				"name": "单页面", //模式名称
-				"path": "pages/exhibitor/index", //启动页面，必选
+				"path": "pages/user/index", //启动页面，必选
 				"query": "id=14" //启动参数，在页面的onLoad函数里面得到
 			}
 		]

pages/exhibitor/exhibit-detail.vue

@@ -3,10 +3,10 @@
     <nav-bar title="展品介绍" @init="onInitNavbar"></nav-bar>
     <u-scroll-view>
       <view class="main-container">
-        <view class="exhibit-image">
+        <view class="exhibit-image" @click="onClickAlbum(exhibit.pic)">
           <image :src="exhibit.pic + '?x-oss-process=image/resize,w_800'" mode="aspectFit"/>
           <view v-for="(item) in exhibit.product_attr_names" class="exhibit-tag">{{ item }}</view>
-          <view class="iconfont icon-Search" @click="onClickAlbum(exhibit.pic)"></view>
+          <view class="iconfont icon-Search"></view>
         </view>
         <view class="exhibit-name">{{ exhibit.name }}</view>
         <view class="exhibit-desc">{{ exhibit.summary }}</view>
@@ -219,7 +219,7 @@ export default {
       position: absolute;
       right: 24rpx;
       top: 24rpx;
-      font-size: $fontSize4;
+      font-size: $fontSize5;
     }
     .exhibit-tag {
       position: absolute;

pages/exhibitor/exhibit.vue

@@ -382,6 +382,9 @@
         position: relative;
         z-index: 7;
         background-color: #ffffff;
+        &:before {
+          content: '';
+        }
       }
       .select-option-module {
         width: 100%;

pages/index/home.vue

@@ -145,7 +145,6 @@
 			return {
 				logo: '',
 				searchKeyword: '',
-        exhibitorList: [],
 				showPopupAd: false,
 				navIcons: [{
 					icon: 'icon-xiaochengxu-guanyuzhanhuiicon',
@@ -207,7 +206,6 @@
 		created() {
 			this.getDashboardData()
 			this.getAdData()
-      this.getExhibitorsList()
 		},
 		mounted() {
 			this.isShow = this.$store.state.app.adIsShow
@@ -264,13 +262,6 @@
 					console.log(res.data);
 				})
 			},
-      getExhibitorsList() {
-        exhibitorsList({page: 1,page_size: 12}).then(res => {
-          if (res.data.data) {
-            this.exhibitorList = res.data.data
-          }
-        })
-      },
 			onLogoClick(item) {
         if (item.id) {
           this.navigateTo('/pages/exhibitor/detail?id=' + item.id)

pages/user/index.vue

@@ -15,6 +15,10 @@
             </view>
             <view v-if="isLoginState && nickName" class="user-phone">手机号：{{ phone }}</view>
           </view>
+          <view class="user-option" @click="onClickSetting">
+            <view class="iconfont icon-setting"></view>
+            <view>设置</view>
+          </view>
         </view>
         <view class="user-grid-menu">
           <view hover-class="active" @click="navigateTo('/pages/user/like')">
@@ -36,8 +40,9 @@
         </view>
         <view class="user-list-item">
           <van-cell-group>
-            <van-cell title="设置" is-link @click="onClickSetting">
-              <view slot="icon" class="iconfont icon-setting"/>
+            <van-cell title="隐私政策" is-link @click="navigateTo('/pages/disclaimer/privacy')">
+            </van-cell>
+            <van-cell title="法律信息" is-link @click="navigateTo('/pages/disclaimer/legalNotice')">
             </van-cell>
           </van-cell-group>
         </view>
@@ -132,7 +137,19 @@ export default {
 .user-info {
   display: flex;
   align-items: center;
-
+  .user-title {
+    flex: 1;
+    min-width: 1px;
+  }
+  .user-option {
+    display: flex;
+    align-items: center;
+    grid-gap: 6px;
+    font-size: 28rpx;
+    .iconfont {
+      font-size: 36rpx;
+    }
+  }
   .user-avator {
     @include display-flex-center;
     width: 111rpx;

pages/video/index.vue

@@ -20,7 +20,8 @@
 					</view>
 				</view>
 				<van-overlay :show="showOverlay" @tap="onClickHideOverlay">
-					<view class="overlay-wrapper">
+					<view class="overlay-wrapper" v-if="showOverlay">
+            <view class="iconfont icon-Cancel"></view>
 						<video v-if="videoUrl" :src="videoUrl" controls autoplay loop @tap.stop></video>
 					</view>
 				</van-overlay>
@@ -95,7 +96,11 @@
 				flex-direction: column;
 				align-items: center;
 				grid-gap: 20rpx;
-
+        padding: 40rpx;
+        background: #ffffff;
+        box-shadow:  5rpx 5rpx 10rpx #cccccc;
+        //border: 1px dashed #eeeeee;
+        border-radius: 10rpx;
 				.video-box {
 					width: 100%;
 					aspect-ratio: 5/3;
@@ -138,10 +143,17 @@
 		.overlay-wrapper {
 			@include display-flex-center;
 			height: 100%;
-
+      .iconfont {
+        color: #ffffff;
+        font-size: 86rpx;
+        position: absolute;
+        right: 20rpx;
+        top: 30%;
+        z-index: 9;
+      }
 			video {
 				width: 100%;
 			}
 		}
 	}
-</style>
+</style>

static/style/pages/exhibitor-item.scss

@@ -86,6 +86,8 @@
 			grid-template-columns: repeat(4, 1fr);
 			font-size: $fontSize2;
 			color: #555555;
+			position: relative;
+			z-index: 7;
 			&>view, &>button{
 				display: flex;
 				align-items: center;