From 286f8111bde321aaa4b7477accabdc69b62e19ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Fri, 25 Dec 2020 17:00:20 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=9F=AD=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/request.js                         | 3 ++-
 app.json                                | 2 +-
 components/swiperVideo/swiperVideo.js   | 3 +++
 components/swiperVideo/swiperVideo.wxml | 2 +-
 pages/businessCard/index.js             | 8 +++++++-
 pages/businessCard/index.wxml           | 4 ----
 pages/shortVideo/shortVideo.js          | 4 ++++
 pages/shortVideo/shortVideo.wxml        | 6 ++++--
 pages/shortVideo/shortVideo.wxss        | 8 +++++++-
 project.config.json                     | 2 +-
 10 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/apis/request.js b/apis/request.js
index 45f6484..5874ef6 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -3,7 +3,8 @@ import {errInfo} from './err'
 import {updToken} from './updateToken'
 
 // 请求方式配置
-const api 	 = "https://mi-org.cnskl.com/api/"
+// const api 	 = "https://mi-org.cnskl.com/api/"
+const api 	 = "https://new-web-test.cnskl.com/api/"
 const header = {
 	"Accept": "application/json"
 }
diff --git a/app.json b/app.json
index eb71881..524d0a3 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
     "pages": [
-        "pages/businessCard/index",
         "pages/shortVideo/shortVideo",
+        "pages/businessCard/index",
         "pages/login/login",
         "pages/businessCard/cards/cards"
     ],
diff --git a/components/swiperVideo/swiperVideo.js b/components/swiperVideo/swiperVideo.js
index 6e12469..1b36a98 100644
--- a/components/swiperVideo/swiperVideo.js
+++ b/components/swiperVideo/swiperVideo.js
@@ -43,6 +43,9 @@ Component({
     methods: {
         // 视频滚动了
         changeVideo(e){
+            
+            console.log(e)
+
             let videoLists = this.data.videoList,
                 current    = e.detail.current,
                 currentId  = this.data.playId,
diff --git a/components/swiperVideo/swiperVideo.wxml b/components/swiperVideo/swiperVideo.wxml
index bcaaf50..fc7c1c3 100644
--- a/components/swiperVideo/swiperVideo.wxml
+++ b/components/swiperVideo/swiperVideo.wxml
@@ -13,7 +13,7 @@
             bindpause="vipdeBindPlay"
             loop
         >
-            <cover-image class="videoLayer-play {{!isPlay ? 'show': ''}}" src="/static/icon/play_icon.png"></cover-image>
         </video>
+        <image src=""></image>
     </swiper-item>
 </swiper>
diff --git a/pages/businessCard/index.js b/pages/businessCard/index.js
index d15ce77..b269da1 100644
--- a/pages/businessCard/index.js
+++ b/pages/businessCard/index.js
@@ -1,4 +1,10 @@
-// pages/businessCard/index.js
+
+/**
+ *  Web唐明明
+ *  匆匆数载恍如梦，岁月迢迢华发增。
+ *  碌碌无为枉半生，一朝惊醒万事空。
+ */
+
 Page({
 
     /**
diff --git a/pages/businessCard/index.wxml b/pages/businessCard/index.wxml
index 03061a4..e69de29 100644
--- a/pages/businessCard/index.wxml
+++ b/pages/businessCard/index.wxml
@@ -1,4 +0,0 @@
-
-<view>名片</view>
-
-<navigator url="./cards/cards">名片夹</navigator>
diff --git a/pages/shortVideo/shortVideo.js b/pages/shortVideo/shortVideo.js
index 2483a41..12f7bf6 100644
--- a/pages/shortVideo/shortVideo.js
+++ b/pages/shortVideo/shortVideo.js
@@ -16,6 +16,7 @@ Page({
      */
     onLoad(options) {
         wx.$api.video.videos().then(res=>{
+            console.log(res)
             this.setData({
                 videoList: res,
                 videoId  : res[0].video_id
@@ -43,6 +44,9 @@ Page({
      * 获取视频下标
      */
     swiperIndex(e){
+
+        console.log(e.detail.current)
+
         this.setData({
             videoIndex: e.detail.current
         })
diff --git a/pages/shortVideo/shortVideo.wxml b/pages/shortVideo/shortVideo.wxml
index 30aefd0..48fa4ac 100644
--- a/pages/shortVideo/shortVideo.wxml
+++ b/pages/shortVideo/shortVideo.wxml
@@ -9,6 +9,8 @@
         bind:swiperindex="swiperIndex"
     >
     </swiperViode>
+    <!-- 视频播放按钮 -->
+    <view class="videoLayer-play {{!isPlay ? 'show': ''}}" src="/static/icon/play_icon.png"></view>
     <!-- 视频信息 -->
     <view class="video-info">
         <view class="video-user">@ {{videoList[videoIndex].company.name || "-"}}</view>
@@ -23,10 +25,10 @@
             <image class="video-tool-icon" src="/static/icon/video_tool_00.png" mode="widthFix"></image>
             <view class="video-tool-number">{{videoList[videoIndex].likes || "0"}}</view>
         </view>
-        <!-- <view class="video-tool-item">
+        <view class="video-tool-item">
             <image class="video-tool-icon" src="/static/icon/video_tool_01.png" mode="widthFix"></image>
             <view class="video-tool-number">1000</view>
-        </view> -->
+        </view>
         <view class="video-tool-item">
             <image class="video-tool-icon" src="/static/icon/video_tool_02.png" mode="widthFix"></image>
             <view class="video-tool-number">{{videoList[videoIndex].shares || "0"}}</view>
diff --git a/pages/shortVideo/shortVideo.wxss b/pages/shortVideo/shortVideo.wxss
index 40e6c66..bdad705 100644
--- a/pages/shortVideo/shortVideo.wxss
+++ b/pages/shortVideo/shortVideo.wxss
@@ -5,7 +5,13 @@
  */
 
 page{
-    background: #0e0c1a;
+    /* background: #0e0c1a; */
+}
+
+.videoSwiper{
+    width: 100%;
+    height: 80%;
+    background: #eee;
 }
 
 .videos-content{
diff --git a/project.config.json b/project.config.json
index b1d2603..c2263ad 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,7 +4,7 @@
         "ignore": []
     },
     "setting": {
-        "urlCheck": true,
+        "urlCheck": false,
         "es6": true,
         "enhance": false,
         "postcss": true,