diff --git a/app.json b/app.json
index 79327d0..cad6cc5 100644
--- a/app.json
+++ b/app.json
@@ -89,9 +89,9 @@
},
"window": {
"backgroundTextStyle": "dark",
- "navigationBarBackgroundColor": "#02C0FF",
+ "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTitleText": "",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
},
"networkTimeout": {
"request": 30000,
diff --git a/components/banner/index.wxml b/components/banner/index.wxml
index 9d5d521..85808bc5 100644
--- a/components/banner/index.wxml
+++ b/components/banner/index.wxml
@@ -9,9 +9,9 @@
-
+
\ No newline at end of file
diff --git a/components/banner/index.wxss b/components/banner/index.wxss
index a16fa9a..0bf4cbd 100644
--- a/components/banner/index.wxss
+++ b/components/banner/index.wxss
@@ -1,20 +1,20 @@
.index-slide-view{
position: relative;
- width: 710rpx;
- height: 260rpx;
+ width: 750rpx;
+ height: 390rpx;
overflow: hidden;
- margin:-126rpx auto 0;
- border-radius:16rpx;
- box-shadow: 0 6px 20px 0 rgba(0,0,0,0.15);
+ margin:-166rpx auto 0;
+ /* border-radius:16rpx; */
+ /* box-shadow: 0 6px 20px 0 rgba(0,0,0,0.15); */
}
.index-slide,
swiper-item
.index-slide-image {
display: block;
- width: 710rpx;
- height: 260rpx;
+ width: 750rpx;
+ height: 390rpx;
margin: 0 auto;
- border-radius:16rpx;
+ /* border-radius:16rpx; */
overflow: hidden;
position: relative;
diff --git a/ext.json b/ext.json
index b401967..44564c6 100644
--- a/ext.json
+++ b/ext.json
@@ -1,16 +1,16 @@
{
"extEnable": true,
- "extAppid": "wx3161a41ebc41c6a6",
+ "extAppid": "wxea71200db93d756b",
"ext": {
- "weappId": "wx3161a41ebc41c6a6",
- "name": "永修铜锣湾",
+ "weappId": "wxea71200db93d756b",
+ "name": "富茂客官开发",
"appVersion": "C.3.4.1",
"attr": {
- "ifHaveCarModular": "0",
+ "ifHaveCarModular": "1",
"etcpversion": "release",
- "configUrl": "https://c.malls.iformall.com/C/api",
- "passCarAppId": "wxc07f9d67923d676d",
- "passCarreturnUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
+ "configUrl": "https://ciformall.youlane.cn/C/api",
+ "passCarAppId": "wx192b7d2e8dcbefd0",
+ "passCarreturnUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback"
}
},
"permission": {
@@ -45,9 +45,9 @@
},
"window": {
"backgroundTextStyle": "dark",
- "navigationBarBackgroundColor": "#02C0FF",
+ "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTitleText": "WeChat",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
},
"networkTimeout": {
"request": 30000,
diff --git a/pages/index/index.js b/pages/index/index.js
index bfb79ef..ee50683 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -187,6 +187,16 @@ Page({
showPages: true
})
app.globalData.token = res.data.token;
+ if (res.data && res.data.score) {
+ if (res.data.score != 0){
+ }else{
+ wx.showToast({
+ title: '获得' + res.data.score+'成长值',
+ duration:2000,
+ icon:"none"
+ })
+ }
+ }
Http.setToken(res.data.token);
if (options&&(options.couponChannelId || options.orderId)){
that.checkuerstatus(options);
diff --git a/pages/main/index.js b/pages/main/index.js
index 493ccb8..170d20e 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -102,6 +102,12 @@ Page({
showQrcode: false
})
},
+ //跳往个人中心
+ gotouser:function(){
+ wx.navigateTo({
+ url: '/pages/user/czdetail',
+ })
+ },
//搜索门店
searchbar:function(){
wx.navigateTo({
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index fddf0d0..8fc6139 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -21,6 +21,9 @@
我的券包
+
+
+
diff --git a/pages/main/index.wxss b/pages/main/index.wxss
index 8386e59..77f9bb0 100644
--- a/pages/main/index.wxss
+++ b/pages/main/index.wxss
@@ -55,6 +55,15 @@ page {
width: 335rpx;
height: 161rpx;
}
+.userinfo{
+ margin: 0 auto;
+ width: 690rpx;
+ height: 120rpx;
+background:rgba(255,255,255,1);
+border:1rpx solid rgba(56, 56, 56, 0.11);
+box-shadow:0rpx 6rpx 8rpx 1rpx rgba(56,56,56,0.08);
+border-radius:50rpx;
+}
.section {
padding: 0 20rpx;
justify-content: space-around;
diff --git a/project.config.json b/project.config.json
index e03f6ca..94b0632 100644
--- a/project.config.json
+++ b/project.config.json
@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.2.0",
- "appid": "wx453ae0d37f3550d0",
+ "appid": "wx7413eea5344a1554",
"projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F",
"isGameTourist": false,
"condition": {