From f503390094759d0e9c551c9b8dde913e1913aaf1 Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Sat, 22 Feb 2025 16:47:04 +0800
Subject: [PATCH] =?UTF-8?q?UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/tab-bar/tab-bar.vue | 17 ++++++-----
custom-tab-bar/index.js | 54 +++++++++++++++++++---------------
custom-tab-bar/index.wxml | 9 +++---
main.js | 4 +--
pages.json | 24 +++++++--------
pages/shouye/detail_wuxian.vue | 4 +--
pages/shouye/index.vue | 30 +++++++++----------
7 files changed, 74 insertions(+), 68 deletions(-)
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 5ec1452..09fb896 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -50,6 +50,7 @@
url: 'open_card',
success(res) {
// uni.setStorageSync('empty', res.data.userinfo.is_y_quota)
+ console.log('aaaaaaaaaaaaaaaa');
if (res.data.data.open_card == 1) {
that.list = [{
id: 1,
@@ -98,25 +99,25 @@
},
{
id: 2,
- icon: '/static/tabbar/wuxian.png',
- actIcon: '/static/tabbar/wuxian_sel.png',
- title: '无限赏',
- path: '/pages/infinite/index'
- },
- {
- id: 3,
icon: '/static/tabbar/shop.png',
actIcon: '/static/tabbar/shop_sel.png',
title: '商城',
path: '/pages/shop/index'
},
{
- id: 4,
+ id: 3,
icon: '/static/tabbar/hegui.png',
actIcon: '/static/tabbar/hegui_sel.png',
title: '盒柜',
path: '/pages/sangdai/sangdai'
},
+ {
+ id: 4,
+ icon: '/static/tabbar/wuxian.png',
+ actIcon: '/static/tabbar/wuxian_sel.png',
+ title: '无限赏',
+ path: '/pages/infinite/index'
+ },
{
id: 5,
icon: '/static/tabbar/mine.png',
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 3e1461c..3a2f2dd 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -3,37 +3,40 @@ Component({
selected: 0,
color: "#999999",
selectedColor: "#FFFFFF",
- list: [
- {
- "pagePath": "/pages/shouye/index",
- "iconPath": "/static/tabbar/m1.png",
- "selectedIconPath": "/static/tabbar/s1.png",
- "text": ""
- },
- {
- "pagePath": "/pages/infinite/index",
- "iconPath": "/static/tabbar/m2.png",
- "selectedIconPath": "/static/tabbar/s2.png",
- "text": ""
+ list: [{
+ "index": 0,
+ "pagePath": "/pages/shouye/index",
+ "iconPath": "/static/tabbar/m1.png",
+ "selectedIconPath": "/static/tabbar/s1.png",
+ // "text": "抽赏"
},
{
+ "index": 2,
"pagePath": "/pages/mall/index",
"iconPath": "/static/tabbar/m5.png",
"selectedIconPath": "/static/tabbar/s5.png",
- "text": ""
+ // "text": "商城"
},
{
- "pagePath": "/pages/sangdai/sangdai",
- "iconPath": "/static/tabbar/m3.png",
- "selectedIconPath": "/static/tabbar/s3.png",
- "text": ""
+ "index": 3,
+ "pagePath": "/pages/sangdai/sangdai",
+ "iconPath": "/static/tabbar/m3.png",
+ "selectedIconPath": "/static/tabbar/s3.png",
+ // "text": "盒柜"
},
-
{
- "pagePath": "/pages/user/index",
- "iconPath": "/static/tabbar/m4.png",
- "selectedIconPath": "/static/tabbar/s4.png",
- "text": ""
+ "index": 1,
+ "pagePath": "/pages/infinite/index",
+ "iconPath": "/static/tabbar/m2.png",
+ "selectedIconPath": "/static/tabbar/s2.png",
+ // "text": "积分赏"
+ },
+ {
+ "index": 4,
+ "pagePath": "/pages/user/index",
+ "iconPath": "/static/tabbar/m4.png",
+ "selectedIconPath": "/static/tabbar/s4.png",
+ // "text": "我的"
}
]
},
@@ -42,8 +45,11 @@ Component({
switchTab(e) {
const data = e.currentTarget.dataset
const url = data.path
- console.log(e,data,url)
- wx.switchTab({ url })
+ console.log(e, data, url, data.index)
+ wx.switchTab({
+ url
+ })
+ // console.log('aaaaaaaa', this.selected, data.index);
this.setData({
selected: data.index
})
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 1b65755..384bc45 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,9 +1,10 @@
-
-
- {{item.text}}
+
+
+ {{item.text}}
+
diff --git a/main.js b/main.js
index 78da329..d78f9d4 100644
--- a/main.js
+++ b/main.js
@@ -213,10 +213,10 @@ Vue.prototype.onBridgeReady = function(data) {
}
// 测试
-// const baseUrl = 'https://api.zpc-xy.com'
+const baseUrl = 'https://testbaji.onelight.vip'
// 正式
-const baseUrl = 'https://bajiapi.onelight.vip'
+// const baseUrl = 'https://bajiapi.onelight.vip'
Vue.prototype.siteBaseUrl = baseUrl + '/api/'
Vue.prototype.$z_img2 = baseUrl + '/zcq/'
diff --git a/pages.json b/pages.json
index 7bff45a..4b78b05 100644
--- a/pages.json
+++ b/pages.json
@@ -404,19 +404,17 @@
}
},
{
- "path" : "pages/shouye/ranking",
- "style" :
- {
+ "path": "pages/shouye/ranking",
+ "style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
- "path" : "pages/user/bangdingweb",
- "style" :
- {
- "navigationBarTitleText" : "绑定手机号"
+ "path": "pages/user/bangdingweb",
+ "style": {
+ "navigationBarTitleText": "绑定手机号"
}
}
],
@@ -511,12 +509,6 @@
"selectedIconPath": "static/tabbar/s1.png"
// "text": "抽赏"
},
- {
- "pagePath": "pages/infinite/index",
- "iconPath": "static/tabbar/m2.png",
- "selectedIconPath": "static/tabbar/s2.png"
- // "text": "积分赏"
- },
{
"pagePath": "pages/mall/index",
"iconPath": "static/tabbar/m5.png",
@@ -529,6 +521,12 @@
"selectedIconPath": "static/tabbar/s3.png"
// "text": "盒柜"
},
+ {
+ "pagePath": "pages/infinite/index",
+ "iconPath": "static/tabbar/m2.png",
+ "selectedIconPath": "static/tabbar/s2.png"
+ // "text": "积分赏"
+ },
{
"pagePath": "pages/user/index",
"iconPath": "static/tabbar/m4.png",
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index aae8f8e..8c00229 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -370,7 +370,7 @@
- {{ previewData.shang_title }} {{ previewData.pro }}
+ {{ previewData.shang_title }} 概率:{{ previewData.pro }}%
产品类型:{{ optData.type_text }}
@@ -685,7 +685,7 @@
imgurl: a.imgurl,
title: a.title,
shang_title: item.shang_title,
- pro: item.pro
+ pro: a.real_pro
}
console.log(obj)
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 0acfc28..0ce0770 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -36,7 +36,7 @@
+ :src="$img1('/image/a6548-pw1cx.webp')">
@@ -185,26 +185,26 @@
id: 4,
title: '吧唧赏'
},
+ // {
+ // id: 1,
+ // title: '一番赏'
+ // },
+ // {
+ // id: 12,
+ // title: '连击赏'
+ // },
+ // {
+ // id: 6,
+ // title: '全局赏'
+ // },
{
- id: 1,
- title: '一番赏'
- },
- {
- id: 12,
- title: '连击赏'
- },
- {
- id: 6,
- title: '全局赏'
+ id: 2,
+ title: '无限赏'
},
{
id: 8,
title: '领主赏',
},
- // {
- // id: 2,
- // title: '小岚赏'
- // }
{
id: 3,
title: '擂台赏'