diff --git a/components/plv-player-skin2/drag-tips.nvue b/components/plv-player-skin2/drag-tips.nvue
new file mode 100644
index 0000000..40daa31
--- /dev/null
+++ b/components/plv-player-skin2/drag-tips.nvue
@@ -0,0 +1,97 @@
+/**
+* @file 拖动进度提示组件
+*/
+
+
+
+
+
+
+ {{changeTimeFormat}} / {{durationFormat}}
+
+
+
+
+
+
+
+
diff --git a/components/plv-player-skin2/gesture.nvue b/components/plv-player-skin2/gesture.nvue
new file mode 100644
index 0000000..391a958
--- /dev/null
+++ b/components/plv-player-skin2/gesture.nvue
@@ -0,0 +1,271 @@
+
+
+
+
+
+
+
+
diff --git a/components/plv-player-skin2/light.nvue b/components/plv-player-skin2/light.nvue
new file mode 100644
index 0000000..325f806
--- /dev/null
+++ b/components/plv-player-skin2/light.nvue
@@ -0,0 +1,68 @@
+
+
+
+ {{ precent + '%' }}
+
+
+
+
+
+
diff --git a/components/plv-player-skin2/skin.nvue b/components/plv-player-skin2/skin.nvue
new file mode 100644
index 0000000..fe4f426
--- /dev/null
+++ b/components/plv-player-skin2/skin.nvue
@@ -0,0 +1,1204 @@
+
+
+
+
+
+ 快进x2.0
+
+
+
+
+
+
+
+
+ {{topSubtitle.text}}
+ {{bottomSubtitle.text}}
+ {{singleSubtitle.text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentTimeText }}
+ /
+ {{ durationText }}
+
+
+ {{ currentLevelText }}
+ {{ currentSpeedText }}
+ 画面
+ 字幕
+
+
+
+
+
+
+
+
+
+ {{ item[0] }}
+
+
+
+
+
+
+
+
+
+
diff --git a/components/plv-player-skin2/volume.nvue b/components/plv-player-skin2/volume.nvue
new file mode 100644
index 0000000..77048b3
--- /dev/null
+++ b/components/plv-player-skin2/volume.nvue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index fe2ab6c..b7d9f54 100644
--- a/pages.json
+++ b/pages.json
@@ -9,16 +9,16 @@
}
},
"pages": [
- // {
- // "path": "pages/upload/upload",
- // "style": {
- // "navigationBarTitleText": "",
- // "navigationStyle": "custom",
- // "app": {
- // "bounce": "none"
- // }
- // }
- // },
+ {
+ "path": "pages/upload/upload2",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "app": {
+ "bounce": "none"
+ }
+ }
+ },
{
"path": "pages/loading/loading",
"style": {
diff --git a/pages/upload/upload2.nvue b/pages/upload/upload2.nvue
new file mode 100644
index 0000000..b186e6c
--- /dev/null
+++ b/pages/upload/upload2.nvue
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_app/myWelfareCard/myWelfareCard.vue b/pages_app/myWelfareCard/myWelfareCard.vue
index 324da43..2082c41 100644
--- a/pages_app/myWelfareCard/myWelfareCard.vue
+++ b/pages_app/myWelfareCard/myWelfareCard.vue
@@ -19,7 +19,7 @@
- 已兑换{{ cardInfo.length }}张
+ 已兑换{{ totalCount}}张
查看现有权益
帮助说明
@@ -129,7 +129,7 @@
import rightImg from '@/static/right_selsect_big.png'
import empty from '@/components/empty/empty.vue'
import { onLoad,onBackPress } from '@dcloudio/uni-app'
-
+ const totalCount = ref(0);
const from=ref('');
onBackPress(() => {
if(!from.value){
@@ -171,6 +171,7 @@
} else {
cardInfo.value = pageNum.value === 1 ? list : cardInfo.value.concat(list)
}
+ totalCount.value = res.data.total;
hasCard.value = list.length > 0 || cardInfo.value.length > 0
isLastPage.value = !!res.data.isLastPage
}
@@ -221,7 +222,7 @@
const goPointsDetail = () => {
console.log('goPointsDetail')
- uni.navigateTo({ url: '/pages_app/myWelfareCard/exchange?num='+cardInfo.value.length })
+ uni.navigateTo({ url: '/pages_app/myWelfareCard/exchange?num='+totalCount.value })
};
const goMyWelfare = () => {
diff --git a/utils/config.js b/utils/config.js
index 955876d..3bf886e 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,4 +1,4 @@
-//let BASE_URL='https://dev-app.igandan.com/app';
-let BASE_URL='https://app.igandan.com/app'
+let BASE_URL='https://dev-app.igandan.com/app';
+//let BASE_URL='https://app.igandan.com/app'
export default BASE_URL
\ No newline at end of file
diff --git a/utils/docUrl.js b/utils/docUrl.js
index 59aa750..62623a6 100644
--- a/utils/docUrl.js
+++ b/utils/docUrl.js
@@ -1,5 +1,5 @@
-//let DOC_URL='https://dev-doc.igandan.com/app/';
-let DOC_URL='https://doc.igandan.com/app/'
+let DOC_URL='https://dev-doc.igandan.com/app/';
+//let DOC_URL='https://doc.igandan.com/app/'
// if(app.globalData.apiHost.indexOf('dev')>-1){
// DOC_URL='https://dev-doc.igandan.com/app/'
// }else{
diff --git a/utils/otherHost.js b/utils/otherHost.js
index 11eb0ef..9693cac 100644
--- a/utils/otherHost.js
+++ b/utils/otherHost.js
@@ -1,5 +1,5 @@
-//let OTHER_HOST='https://dev-wx.igandan.com'
-let OTHER_HOST='https://wx.igandan.com'
+let OTHER_HOST='https://dev-wx.igandan.com'
+//let OTHER_HOST='https://wx.igandan.com'
//const app = getApp({allowDefault: true});
// if(app.globalData.apiHost && app.globalData.apiHost.indexOf('dev')>-1){
// OTHER_HOST='https://dev-wx.igandan.com'