diff --git a/apis/request.js b/apis/request.js
index 07701d7..c57eff1 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -3,8 +3,8 @@ import {errInfo} from './err'
import {updToken} from './updateToken'
// 请求方式配置
-const api = "https://new-web-test.cnskl.com/api/"
-// const api = "https://mi-org.cnskl.com/api/"
+// const api = "https://new-web-test.cnskl.com/api/"
+const api = "https://mi-org.cnskl.com/api/"
const header = {
"Accept" : "application/json"
}
diff --git a/app.wxss b/app.wxss
index 44b0430..c2c81cc 100644
--- a/app.wxss
+++ b/app.wxss
@@ -10,8 +10,8 @@ page{
font-size: 30rpx;
}
-.tabBar{
- margin-bottom: calc(48px + env(safe-area-inset-bottom));
+.tabBarContent{
+ border-bottom: solid calc(48px + env(safe-area-inset-bottom)) transparent;
}
/*
diff --git a/components/storeTabBar/storeTabBar.js b/components/storeTabBar/storeTabBar.js
index c1e5982..ccebd02 100644
--- a/components/storeTabBar/storeTabBar.js
+++ b/components/storeTabBar/storeTabBar.js
@@ -22,7 +22,7 @@ Component({
data: {
selected : 0,
color : "#4e4f51",
- selectedColor : "#0b0041",
+ selectedColor : "#2b6bf6",
list : []
},
diff --git a/components/storeTabBar/storeTabBar.wxss b/components/storeTabBar/storeTabBar.wxss
index 4ffc7f7..51c5325 100644
--- a/components/storeTabBar/storeTabBar.wxss
+++ b/components/storeTabBar/storeTabBar.wxss
@@ -6,6 +6,7 @@
*/
.tab-bar {
+ z-index: 999999;
position: fixed;
bottom: 0;
left: 0;
diff --git a/pages/config/config.js b/pages/config/config.js
index 0768d29..82673c4 100644
--- a/pages/config/config.js
+++ b/pages/config/config.js
@@ -14,12 +14,12 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(e) {
- if (e.companyoid && e.companyoid == "") {
- wx.showToast({
- title: "参数错误，缺少companyoId"
- })
- return
- }
+ // if (e.companyoid && e.companyoid == "") {
+ // wx.showToast({
+ // title: "参数错误，缺少companyoId"
+ // })
+ // return
+ // }
wx.getStorage({
key : 'compayId',
success : res=>{
@@ -40,18 +40,12 @@ Page({
case "ticket":
newTabBar.push(ticket)
break;
- default :
- newTabBar.push(user)
- break;
}
})
-
- if(tabBarVal.length == newTabBar.length){
- getApp().globalData.storeTabBarConfig = newTabBar
- wx.redirectTo({
- url: newTabBar[0].pagePath,
- })
- }
+ getApp().globalData.storeTabBarConfig = newTabBar.concat([user])
+ wx.redirectTo({
+ url: newTabBar[0].pagePath,
+ })
}).catch(()=>{
this.setData({
loding: false
diff --git a/pages/mall/index.json b/pages/mall/index.json
index c7f1412..cdc080e 100644
--- a/pages/mall/index.json
+++ b/pages/mall/index.json
@@ -8,5 +8,6 @@
},
"navigationBarTitleText": "商城",
"enablePullDownRefresh" : true,
- "navigationBarBackgroundColor": "#ea4e2f"
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#2d6bf6"
}
\ No newline at end of file
diff --git a/pages/mall/index.wxml b/pages/mall/index.wxml
index c7d8a90..a877171 100644
--- a/pages/mall/index.wxml
+++ b/pages/mall/index.wxml
@@ -1,43 +1,44 @@
-
-
-
- 搜索商品
-
+
+
+
+
+ 搜索商品
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/mall/index.wxss b/pages/mall/index.wxss
index 3afc832..59a7e71 100644
--- a/pages/mall/index.wxss
+++ b/pages/mall/index.wxss
@@ -16,7 +16,7 @@ page {
.mallBox::after {
position: absolute;
content: '';
- background-color: #ea4e2f;
+ background-color: #2d6bf6;
border-radius: 0 0 10% 10%;
width: 100%;
height: 38vh;
diff --git a/pages/ticket/index.js b/pages/ticket/index.js
index 020a5a8..4ed48b4 100644
--- a/pages/ticket/index.js
+++ b/pages/ticket/index.js
@@ -41,8 +41,8 @@ Page({
/**
* 生命周期函数--监听页面显示
*/
- onShow: function () {
-
+ onShow() {
+ wx.hideHomeButton()
this.couponInfo();
},
couponInfo() {
diff --git a/pages/ticket/index.wxml b/pages/ticket/index.wxml
index e754f52..0cfb83f 100644
--- a/pages/ticket/index.wxml
+++ b/pages/ticket/index.wxml
@@ -1,5 +1,5 @@
-
+
-
\ No newline at end of file
+
+
+
diff --git a/pages/ticket/index.wxss b/pages/ticket/index.wxss
index cae3d14..760309c 100644
--- a/pages/ticket/index.wxss
+++ b/pages/ticket/index.wxss
@@ -3,8 +3,12 @@
* 企获客商城
*/
+page{
+ background: white;
+}
+
.coupon {
- margin: 0 20rpx;
+ padding: 0 30rpx;
}
/* 轮播图 */
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index e2895a4..77bdf3e 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -20,6 +20,7 @@
+
@@ -61,7 +62,7 @@
- {{ info.cart_counts}}
+ 2
我的购物车
@@ -85,13 +86,13 @@
项目关注
-
+
区块链证书
-
+
@@ -105,5 +106,4 @@
-
\ No newline at end of file
diff --git a/static/tabbar/tabbar_icon_00 2.png b/static/tabbar/tabbar_icon_00 2.png
deleted file mode 100644
index 8b35fbc..0000000
Binary files a/static/tabbar/tabbar_icon_00 2.png and /dev/null differ
diff --git a/static/tabbar/tabbar_icon_01 2.png b/static/tabbar/tabbar_icon_01 2.png
deleted file mode 100644
index 0eaea74..0000000
Binary files a/static/tabbar/tabbar_icon_01 2.png and /dev/null differ
diff --git a/static/tabbar/tabbar_icon_03 2.png b/static/tabbar/tabbar_icon_03 2.png
deleted file mode 100644
index 0586d29..0000000
Binary files a/static/tabbar/tabbar_icon_03 2.png and /dev/null differ
diff --git a/static/tabbar/tabbar_icon_04.png b/static/tabbar/tabbar_icon_04.png
deleted file mode 100644
index 59ca575..0000000
Binary files a/static/tabbar/tabbar_icon_04.png and /dev/null differ
diff --git a/static/tabbar/tabbar_icon_05.png b/static/tabbar/tabbar_icon_05.png
deleted file mode 100644
index 4d69131..0000000
Binary files a/static/tabbar/tabbar_icon_05.png and /dev/null differ
diff --git a/static/tabbar/tabbar_icon_06.png b/static/tabbar/tabbar_icon_06.png
deleted file mode 100644
index e51186b..0000000
Binary files a/static/tabbar/tabbar_icon_06.png and /dev/null differ
diff --git a/static/tabbar/tabbar_icon_show_00.png b/static/tabbar/tabbar_icon_show_00.png
index 0eaea74..10e273f 100644
Binary files a/static/tabbar/tabbar_icon_show_00.png and b/static/tabbar/tabbar_icon_show_00.png differ
diff --git a/static/tabbar/tabbar_icon_show_01.png b/static/tabbar/tabbar_icon_show_01.png
index 59ca575..d3ad6f8 100644
Binary files a/static/tabbar/tabbar_icon_show_01.png and b/static/tabbar/tabbar_icon_show_01.png differ
diff --git a/static/tabbar/tabbar_icon_show_02.png b/static/tabbar/tabbar_icon_show_02.png
index e51186b..db6e13e 100644
Binary files a/static/tabbar/tabbar_icon_show_02.png and b/static/tabbar/tabbar_icon_show_02.png differ
diff --git a/static/tabbar/tabbar_icon_show_03.png b/static/tabbar/tabbar_icon_show_03.png
index 9b0916d..9cfea38 100644
Binary files a/static/tabbar/tabbar_icon_show_03.png and b/static/tabbar/tabbar_icon_show_03.png differ