From 64772c366d7a81bbadad32d45746ec18df5cb5f1 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 06 八月 2025 09:42:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/tabbar/user/utils/tool.vue | 2 +-
pages/passport/wechatMPLogin.vue | 1 -
pages.json | 2 +-
pages/passport/entry/seller/index.vue | 4 ++--
pages/tabbar/index/home.vue | 23 +++++++++++++++++------
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/pages.json b/pages.json
index 9d92817..8ba3292 100644
--- a/pages.json
+++ b/pages.json
@@ -1261,7 +1261,7 @@
{
"path": "entry/seller/index",
"style": {
- "navigationBarTitleText": "搴楅摵鍏ラ┗",
+ "navigationBarTitleText": "渚涘簲鍟嗗叆椹�",
"navigationStyle": "custom",
"componentPlaceholder": {
"u-navbar": "view"
diff --git a/pages/passport/entry/seller/index.vue b/pages/passport/entry/seller/index.vue
index a9eebe7..8505513 100644
--- a/pages/passport/entry/seller/index.vue
+++ b/pages/passport/entry/seller/index.vue
@@ -2,7 +2,7 @@
<div class="wrapper">
<u-navbar :border-bottom="false"></u-navbar>
<div>
- <div class="title">搴楅摵鍏ラ┗</div>
+ <div class="title">渚涘簲鍟嗗叆椹�</div>
<div class="step-list">
<div
class="step-item"
@@ -18,7 +18,7 @@
<label class="agreement-label">
<checkbox :checked="isAgreed" class="agreement-checkbox" :disabled="isDisabled" />
<text class="agreement-text" @click="getEntryNotice">
- 鏌ョ湅搴楅摵<text class="agreement-link">銆婂叆椹诲崗璁��</text>
+ 鏌ョ湅渚涘簲鍟�<text class="agreement-link">銆婂叆椹诲崗璁��</text>
</text>
</label>
</div>
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index f833167..3732606 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -245,7 +245,6 @@
image,
nickName,
}).then((res) => {
- console.log(res)
//鐧诲綍鎴愬姛淇敼鐢ㄦ埛鐨勬樀绉�
storage.setAccessToken(res.data.result.accessToken);
storage.setRefreshToken(res.data.result.refreshToken);
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index b8f0128..1214d3a 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -39,6 +39,8 @@
:object-fit="item.videoFit"
:enable-progress-gesture="false"
:show-center-play-btn="false"
+ :show-progress="true"
+ :show-fullscreen-btn="true"
class="video-item"
@play="onPlay(item.id, index)"
@pause="onPause(index)"
@@ -56,9 +58,10 @@
:style="{bottom: marginBottom + 'px'}"
class="container">
<!-- 杩涘害鏉� - 鏁翠釜鍖哄煙鍙嫋鍔� -->
- <view class="process-warp" :style="{ opacity: showProcess ? 1 : 0 }">
+ <!-- <view class="process-warp" :style="{ opacity: showProcess ? 1 : 0 }"> -->
+ <view class="process-warp">
<!-- 鏄剧ず褰撳墠杩涘害 -->
- <view class="progress-text">{{ hasPlayTime }}/{{formartDuration}}</view>
+ <view v-show="isTouch" class="progress-text">{{ hasPlayTime }}/{{formartDuration}}</view>
<view
class="progress-bar"
id="progressBar"
@@ -276,6 +279,7 @@
},
data() {
return {
+ isTouch:false,
userId :'',
currentImgIndex: 0, // 鎾斁鍒扮鍑犲紶鍥�--绱㈠紩
currentGoodsIndex: 0, // 鎾斁鍒扮鍑犱釜鍟嗗搧--绱㈠紩
@@ -289,7 +293,7 @@
barWidth: 0, // 杩涘害鏉″搴�
isDragging: false, // 鏄惁姝ｅ湪鎷栧姩
processHidenTimer: null, // 杩涘害鏉￠殣钘忓畾鏃跺櫒
- showProcess: false, // 鏄惁鏄剧ず杩涘害鏉�
+ showProcess: true, // 鏄惁鏄剧ず杩涘害鏉�
videoNoMore: false, // 鏄惁杩樻湁鏇村瑙嗛
commentNoMore: false, // 鏄惁杩樻湁鏇村璇勮
commentQuery: {
@@ -1090,6 +1094,7 @@
handleTouchStart(e) {
this.isDragging = true;
this.showProcess = true;
+ this.isTouch = true;
this.startProgress = this.progress; // 璁板綍寮�濮嬫椂鐨勮繘搴�
this.startX = e.touches[0].pageX;
console.log("璁板綍寮�濮嬫椂鐨勮繘搴�", this.startProgress);
@@ -1113,7 +1118,8 @@
videoContext.seek(this.duration * this.progress / 100)
videoContext.play()
this.processHidenTimer = setTimeout(() => {
- this.showProcess = false;
+ // this.showProcess = true;
+ this.isTouch = false;
}, 1000);
},
@@ -1555,16 +1561,21 @@
.progress-bar {
position: relative;
width: 100%;
- height: 16px;
- background-color: #eee;
+ height: 5px;
+ background-color: rgba(255, 255, 255, 0.2); /* 鍗婇�忔槑鑳屾櫙 */
overflow: hidden;
+ border-radius: 1.5px;
+ cursor: pointer;
+ transition: height 0.2s;
}
.progress-fill {
+
position: absolute;
left: 0;
top: 0;
height: 100%;
+ border-radius: 2px;
background-color: lightgray;
transition: width 0.1s;
}
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index eb815e3..009080a 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -120,7 +120,7 @@
<view class="interact-item" @click="navigateTo('/pages/passport/entry/seller/index')">
<image src="/static/mine/feedback.png" mode=""></image>
- <view>搴楅摵鍏ラ┗</view>
+ <view>渚涘簲鍟嗗叆椹�</view>
</view>
--
Gitblit v1.8.0