diff --git a/App.vue b/App.vue
index 66865de8..18c41763 100644
--- a/App.vue
+++ b/App.vue
@@ -62,6 +62,6 @@ img {
--font-button-size:24rpx;
--font-button-size-p:28rpx;
/* tab图标 */
- --tab-url:url('http://mdh.xscmmidi.site/image/tabline.png');
+ --tab-url:url('https://md.xscmmidi.site/h5/image/tabline.png');
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index aeff8ec0..2fb2b18b 100644
--- a/pages.json
+++ b/pages.json
@@ -130,6 +130,15 @@
"popGesture": "none" // 禁用 iOS 左滑返回
}
}
+ },{
+ "path": "pages/feedback/customerService",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "在线客服",
+ "app-plus": {
+ "popGesture": "none" // 禁用 iOS 左滑返回
+ }
+ }
},
{
"path": "pages/feedback/feedback",
@@ -181,6 +190,13 @@
"navigationStyle": "custom",
"navigationBarTitleText": "关于我们"
}
+ },
+ {
+ "path": "pages/other/test",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "测试页面"
+ }
}
],
"globalStyle": {
diff --git a/pages/feedback/customerService.vue b/pages/feedback/customerService.vue
new file mode 100644
index 00000000..3eda8539
--- /dev/null
+++ b/pages/feedback/customerService.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/feedback/help.vue b/pages/feedback/help.vue
index 77abc9e6..0b3aab35 100644
--- a/pages/feedback/help.vue
+++ b/pages/feedback/help.vue
@@ -1,5 +1,5 @@
-
+
@@ -118,7 +118,7 @@
methods: {
async getHelpList() {
http.get('/api/Help/help_type', {
- token: uni.getStorageSync('token') ?? ''
+ token: uni.getStorageSync('token') || ''
}).then(response => {
const {
data,
@@ -145,7 +145,7 @@
},
async getProblemList(id) {
http.get('/api/Help/help_list', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
type: id,
page: this.page,
page_limit: this.limit
@@ -179,20 +179,23 @@
});
} else {
// 在线客服
- const platform = uni.getSystemInfoSync().platform;
- // console.log(platform, '打印设备参数')
- if (platform === 'ios') {
- console.log('调用iOS原生方法')
- // 通过 messageHandlers 调用 iOS 原生方法
- window.webkit.messageHandlers.nativeHandler.postMessage({
- 'action': 'customerService'
- });
- } else if (platform === 'android') {
- console.log('调用Android原生方法')
- // 调用 Android 原生方法
- window.Android.customerService();
+ uni.navigateTo({
+ url: `/pages/feedback/customerService?h=${this.statusBarHeight}`
+ });
+ // const platform = uni.getSystemInfoSync().platform;
+ // // console.log(platform, '打印设备参数')
+ // if (platform === 'ios') {
+ // console.log('调用iOS原生方法')
+ // // 通过 messageHandlers 调用 iOS 原生方法
+ // window.webkit.messageHandlers.nativeHandler.postMessage({
+ // 'action': 'customerService'
+ // });
+ // } else if (platform === 'android') {
+ // console.log('调用Android原生方法')
+ // // 调用 Android 原生方法
+ // window.Android.customerService();
- }
+ // }
}
},
back() {
diff --git a/pages/feedback/problemDetail.vue b/pages/feedback/problemDetail.vue
index 901e5c2e..1defb3f7 100644
--- a/pages/feedback/problemDetail.vue
+++ b/pages/feedback/problemDetail.vue
@@ -57,7 +57,7 @@
methods: {
getDetail(id) {
http.get('/api/Help/help_detail', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
id: id
}).then(response => {
const {
diff --git a/pages/feedback/report.vue b/pages/feedback/report.vue
index 54e11761..ca758e6b 100644
--- a/pages/feedback/report.vue
+++ b/pages/feedback/report.vue
@@ -111,7 +111,7 @@
},
async getTypeList() {
http.get('/api/Report/report_type_list', {
- token: uni.getStorageSync('token') ?? ''
+ token: uni.getStorageSync('token') || ''
}).then(response => {
const {
code,
@@ -140,7 +140,7 @@
}
http.post('/api/Report/report', {
...formData,
- token: uni.getStorageSync('token') ?? ''
+ token: uni.getStorageSync('token') || ''
}).then(response => {
const {
data,
diff --git a/pages/feedback/teenage.vue b/pages/feedback/teenage.vue
index 6b6c2ad8..44a3a6f3 100644
--- a/pages/feedback/teenage.vue
+++ b/pages/feedback/teenage.vue
@@ -1,5 +1,5 @@
-
+
@@ -90,7 +90,7 @@ export default {
},
async getUnderageTypeList() {
http.get('/api/Usermode/getUnderageTypeList', {
- token: uni.getStorageSync('token') ?? ''
+ token: uni.getStorageSync('token') || ''
}).then(response => {
const {
data,
@@ -115,7 +115,7 @@ export default {
},
async getUnderageModeList(type) {
http.get('/api/Usermode/getUnderageModeList', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
type: type,
page: this.pageConfig.currentPage,
page_limit: this.pageConfig.pageSize
diff --git a/pages/feedback/teenageDetail.vue b/pages/feedback/teenageDetail.vue
index 2a3dfc3c..1d22e143 100644
--- a/pages/feedback/teenageDetail.vue
+++ b/pages/feedback/teenageDetail.vue
@@ -1,5 +1,5 @@
-
+
@@ -62,7 +62,7 @@
})
http.get('/api/Usermode/getUnderageModeContent', {
id: Id,
- token: uni.getStorageSync('token') ?? ''
+ token: uni.getStorageSync('token') || ''
}).then(response => {
uni.hideLoading()
const {
diff --git a/pages/other/aboutUs.vue b/pages/other/aboutUs.vue
index 856af00f..918fcc8a 100644
--- a/pages/other/aboutUs.vue
+++ b/pages/other/aboutUs.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/other/grade.vue b/pages/other/grade.vue
index 290713e5..dbdf515b 100644
--- a/pages/other/grade.vue
+++ b/pages/other/grade.vue
@@ -1,5 +1,5 @@
-
+
@@ -14,8 +14,7 @@
魅力等级
-
-
+
@@ -27,15 +26,19 @@
{{levelActiveData[0].level_str || levelActiveData[0].name}}
距离下一个段位还差{{detailData.user.next_exp}}经验值
+
+
+
+
@@ -66,75 +69,27 @@
-
-
-
-
-
-
-
-
- 财富特权
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
- {{item.name}}
-
-
-
+
+
+
+ {{`如何获得${currentIndex ? '魅力' : '财富'}值?`}}
-
-
-
-
- 等级特权
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
+
+ {{`${currentIndex ? `在平台收到的所有打赏均可转化为魅力值,具体比例为1金币=${detailData.coin_charm_exp}魅力值。` : `在平台的所有打赏均可转化为财富值,具体比例为1金币=${detailData.coin_wealth_exp}财富值。`}`}}
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -190,18 +145,13 @@
this.getWealthLevel()
}
},
- jumpGradeRule() {
- uni.navigateTo({
- url: `/pages/other/gradeRule?flag=${this.currentIndex}&h=${this.statusBarHeight}`
- });
- },
cutTabPage(index) {
this.currentIndex = index
this.getData()
},
async getCharmLevel() {
http.get('/api/Level/get_level_rule', {
- token: uni.getStorageSync('token') ?? ''
+ token: uni.getStorageSync('token') || ''
}).then(response => {
const {
data,
@@ -244,7 +194,7 @@
},
async getWealthLevel() {
http.get('/api/Level/get_wealth_rule', {
- token: uni.getStorageSync('token') ?? ''
+ token: uni.getStorageSync('token') || ''
}).then(response => {
const {
data,
@@ -321,7 +271,7 @@
min-height: 50vh;
background-image: url('@/static/image/grade/Maskgroupx.png');
background-repeat: no-repeat;
-
+ position: relative;
.navbar {
display: inline-flex;
justify-content: space-around;
@@ -409,9 +359,13 @@
.content-view {
min-height: 46vh;
- width: 100%;
- padding: 0 32rpx;
-
+ // width: 100%;
+ width: calc(100% - 64rpx);
+ padding:32rpx;
+ // position: absolute;
+ // top: 50%;
+ border-radius: 32rpx 32rpx 0 0;
+ background-color: #fff;
.card-view {
// padding: 24rpx 0;
diff --git a/pages/other/gradeRule.vue b/pages/other/gradeRule.vue
index 6c4695d5..99f1ea5f 100644
--- a/pages/other/gradeRule.vue
+++ b/pages/other/gradeRule.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/other/income.vue b/pages/other/income.vue
index 80d07231..5bd8fea9 100644
--- a/pages/other/income.vue
+++ b/pages/other/income.vue
@@ -247,7 +247,7 @@
},
async gettabs() {
http.get('/api/Invited/get_init_code', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
}).then(response => {
const {
data,
@@ -277,7 +277,7 @@
},
getInvitedList() {
http.get('/api/Invited/invited_list', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
}).then(response => {
const {
data,
@@ -290,7 +290,7 @@
},
getBillList() {
http.get('/api/Invited/bill_list', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
}).then(response => {
const {
data,
@@ -361,7 +361,7 @@
mask: true
})
http.post('/api/Invited/invited_bind', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
init_code: this.bindValue
}).then(response => {
const {
diff --git a/pages/other/test.vue b/pages/other/test.vue
new file mode 100644
index 00000000..af23e4b8
--- /dev/null
+++ b/pages/other/test.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+ {{content}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/prop/propMall.vue b/pages/prop/propMall.vue
index f3c33198..fd0aa30b 100644
--- a/pages/prop/propMall.vue
+++ b/pages/prop/propMall.vue
@@ -80,9 +80,9 @@
{{menu.day}}天
-
+
@@ -141,7 +141,7 @@
methods: {
async gettabs() {
http.get('/api/Decorate/get_type_list', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
have_hot: 0
}).then(response => {
const {
@@ -170,7 +170,7 @@
},
async getDecorate(type) {
http.get('/api/Decorate/get_decorate_list', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
type
}).then(response => {
const {
@@ -186,7 +186,7 @@
},
async getDecorateDetail(id, detail) {
http.get('/api/Decorate/get_decorate_detail', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
did: id
}).then(response => {
const {
@@ -249,7 +249,7 @@
mask: true
})
http.post('/api/Decorate/pay_decorate', {
- token: uni.getStorageSync('token') ?? '',
+ token: uni.getStorageSync('token') || '',
did: this.decorateDetail.did,
day: this.payData.day
}).then(response => {
diff --git a/pages/union/detail.vue b/pages/union/detail.vue
index eff7aa55..fb17c9a9 100644
--- a/pages/union/detail.vue
+++ b/pages/union/detail.vue
@@ -1,5 +1,5 @@
-
+
@@ -122,6 +122,7 @@
+ Vespa
+
+
+
+
+
+
+
+
+