diff --git a/F53dxaEHpucqec703969e52f567a74953916a631cb8a.bin b/F53dxaEHpucqec703969e52f567a74953916a631cb8a.bin
new file mode 100644
index 0000000..9824b56
Binary files /dev/null and b/F53dxaEHpucqec703969e52f567a74953916a631cb8a.bin differ
diff --git a/ext.json b/ext.json
index 34dfe10..26ac5c3 100644
--- a/ext.json
+++ b/ext.json
@@ -1,91 +1,43 @@
{
"ext": {
"attr": {
- "car": {
- "etcp": {
- "etcpAppId": "wx192b7d2e8dcbefd0",
- "etcpVersion": "release",
- "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
- }
- },
- "mchId": "1604439800",
- "imgProxy": [
- {
- "newUrl": "https://ctest.malls.iformall.com/img",
- "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
- },
- {
- "newUrl": "https://ctest.malls.iformall.com/img1",
- "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
- },
- {
- "newUrl": "https://ctest.malls.iformall.com/img2",
- "orgUrl": "https://wx.qlogo.cn"
- }
- ],
- "configUrl": "https://ctest.malls.iformall.com/C/api",
- "businessSwitch": "1",
- "ifHaveWebSocket": "0",
- "ifHaveCarModular": "1"
+ "configUrl": "https://btest.malls.iformall.com",
+ "datatowerurl": "https://mobiletest.malls.iformall.com"
},
- "name": "金泸商务",
- "weappId": "wx649b3be73c1afe47",
- "appVersion": "C.test.5.2.0"
+ "name": "金泸商务商家版",
+ "weappId": "wx9ff823abeef23b94",
+ "appVersion": "Btest.5.1.0"
},
"debug": false,
"tabBar": {
"list": [
{
"text": "首页",
- "iconPath": "assets/images/home.png",
- "pagePath": "index/index",
- "selectedIconPath": "assets/images/home-a.png"
- },
- {
- "text": "首页",
- "iconPath": "assets/images/home.png",
- "pagePath": "pages/theme/index1/index",
- "selectedIconPath": "assets/images/home-a.png"
- },
- {
- "text": "门店",
- "iconPath": "assets/images/mendian.png",
- "pagePath": "index/searchbar",
- "selectedIconPath": "assets/images/mendian-a.png"
+ "iconPath": "static/images/home-n.png",
+ "pagePath": "pages/main/main",
+ "selectedIconPath": "static/images/home-y.png"
},
{
- "text": "停车",
- "iconPath": "assets/images/park.png",
- "pagePath": "index/passCar",
- "selectedIconPath": "assets/images/park-a.png"
+ "text": "账单",
+ "iconPath": "static/images/bill.png",
+ "pagePath": "pages/bill/bill",
+ "selectedIconPath": "static/images/bill1.png"
},
{
"text": "我的",
- "iconPath": "assets/images/user.png",
- "pagePath": "index/user",
- "selectedIconPath": "assets/images/user-a.png"
+ "iconPath": "static/images/user-n.png",
+ "pagePath": "pages/mine/mine",
+ "selectedIconPath": "static/images/user-y.png"
}
],
- "color": "#abb1be",
- "selectedColor": "#b2743d"
+ "color": "#9F9F9F",
+ "selectedColor": "#52a0fd"
},
"window": {
- "backgroundTextStyle": "dark",
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#FFFFFF"
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#52A0FD"
},
- "plugins": {
- "auto-points-plugin": {
- "version": "1.3.0",
- "provider": "wxfab2bf944bfc4da6"
- },
- "live-player-plugin": {
- "version": "1.3.4",
- "provider": "wx2b03c6e691cd7370"
- }
- },
- "extAppid": "wx649b3be73c1afe47",
+ "extAppid": "wx9ff823abeef23b94",
"extEnable": true,
"permission": {
"scope.userLocation": {
@@ -96,9 +48,5 @@
"networkTimeout": {
"request": 30000,
"downloadFile": 10000
- },
- "requiredPrivateInfos": [
- "chooseLocation",
- "getLocation"
- ]
+ }
}
\ No newline at end of file
diff --git a/index/index.wxml b/index/index.wxml
index 958c85b..6a2bcf5 100644
--- a/index/index.wxml
+++ b/index/index.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/mhcSXjAmf6ibec703969e52f567a74953916a631cb8a.bin b/mhcSXjAmf6ibec703969e52f567a74953916a631cb8a.bin
new file mode 100644
index 0000000..9824b56
Binary files /dev/null and b/mhcSXjAmf6ibec703969e52f567a74953916a631cb8a.bin differ
diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml
index aa6b84c..8abdb48 100644
--- a/pages/bannerdetail/index.wxml
+++ b/pages/bannerdetail/index.wxml
@@ -13,7 +13,7 @@
{{data.subTitle}}
活动说明
- {{data.detail}}
+ {{data.detail}}
diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss
index 6dcbe77..29a214e 100644
--- a/pages/bannerdetail/index.wxss
+++ b/pages/bannerdetail/index.wxss
@@ -87,7 +87,7 @@ page {
/* overflow: hidden; */
word-wrap:break-word;
/* text-overflow: ellipsis; */
- font-size: 22rpx;
+ font-size: 26rpx;
color: #6f6f6f;
letter-spacing: 0;
margin: 0 auto;
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 880646e..2cb4eae 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -185,8 +185,8 @@
立即购买
-
+
\ No newline at end of file
diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml
index edc1ebc..4dea2e0 100644
--- a/pages/radetail/index.wxml
+++ b/pages/radetail/index.wxml
@@ -11,30 +11,33 @@
-
-
-
+
+
+
-
- 分享
-
- {{data.title}}
- {{data.subTitle}}
-
- 活动说明
- {{data.detail}}
-
-
- 1、活动人数:{{data.personLimit}}人
- 消耗积分:{{data.credit}} 积分
+
+ 分享
+
+ {{data.title}}
+ {{data.subTitle}}
+
+ 活动说明
+ {{data.detail}}
+
+
+ 1、活动人数:{{data.personLimit}}人
+
+ 消耗积分:
+ {{data.credit}} 积分
- 2、报名有效日期
- {{startTime}}--{{endTime}}
- 1、活动有效日期
- 3、活动有效日期
- {{activityStartTime}}--{{activityEndTime}}
+ 2、报名有效日期
+ {{startTime}}--{{endTime}}
+ 1、活动有效日期
+ 3、活动有效日期
+ {{activityStartTime}}--{{activityEndTime}}
+
@@ -53,4 +56,4 @@
-
+
\ No newline at end of file
diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss
index 7fbf77d..c0197f6 100644
--- a/pages/radetail/index.wxss
+++ b/pages/radetail/index.wxss
@@ -1,8 +1,10 @@
@import "../../app.wxss";
@import "../../wxParse/wxParse.wxss";
-page{
- background: #F4F5F9;
+
+page {
+ background: #f4f5f9;
}
+
.coupons {
width: 100%;
position: relative;
@@ -11,17 +13,19 @@ page{
.coupons-body {
flex: 1;
}
-.apply{
+
+.apply {
position: fixed;
bottom: 152rpx;
left: 100rpx;
margin: auto;
- width:556rpx;
+ width: 556rpx;
font-size: 30rpx;
text-align: center;
background-color: #f6f6f6;
color: #888;
}
+
.banner {
position: relative;
width: 750rpx;
@@ -33,11 +37,9 @@ page{
width: 750rpx;
}
-
-
.txt001 {
display: block;
- font-size: 34rpx;
+ font-size: 36rpx !important;
color: #363636;
letter-spacing: 0;
text-align: left;
@@ -46,7 +48,7 @@ page{
}
.txt002 {
- font-size: 24rpx;
+ font-size: 30rpx !important;
color: #999;
letter-spacing: 0;
text-align: left;
@@ -60,7 +62,7 @@ page{
.proct text:nth-of-type(1) {
display: block;
- font-size: 30rpx;
+ font-size: 32rpx !important;
color: #ff4949;
letter-spacing: 0;
line-height: 32rpx;
@@ -69,11 +71,12 @@ page{
.proct text:nth-of-type(2) {
display: block;
- font-size: 22rpx;
+ font-size: 30rpx;
color: #6f6f6f;
letter-spacing: 0;
margin: 0 auto;
}
+
.banner text {
position: absolute;
right: 0;
@@ -156,14 +159,16 @@ navigator {
width: 344rpx;
}
-.navigator-hover{
- opacity: 1!important;
- background: #fff!important;
- border-radius:16rpx;
+.navigator-hover {
+ opacity: 1 !important;
+ background: #fff !important;
+ border-radius: 16rpx;
}
-.active{
- opacity: .6;
+
+.active {
+ opacity: 0.6;
}
+
navigator:nth-of-type(2n) {
float: right;
}
@@ -510,41 +515,47 @@ scroll-view {
font-size: 26rpx;
line-height: 15rpx;
}
-button::after{ border: none; }
-.goback{
+
+button::after {
+ border: none;
+}
+
+.goback {
position: fixed;
/* right: 50rpx; */
left: 22rpx;
bottom: 22rpx;
- width:132rpx!important;
- height:96rpx;
+ width: 132rpx !important;
+ height: 96rpx;
z-index: 100;
- background:rgba(255,255,255,1);
+ background: rgba(255, 255, 255, 1);
line-height: 95rpx;
- border:1rpx solid rgba(227,227,227,1);
- border-radius:32rpx;
+ border: 1rpx solid rgba(227, 227, 227, 1);
+ border-radius: 32rpx;
}
+
.goback image {
position: absolute;
- width:52rpx;
+ width: 52rpx;
height: 50rpx;
left: 0;
right: 0;
top: 0;
- bottom:0;
- margin:10rpx auto;
+ bottom: 0;
+ margin: 10rpx auto;
}
-.btnTxt{
+.btnTxt {
width: 50rpx;
height: 30rpx;
line-height: 50rpx;
- color: #FD782D;
+ color: #fd782d;
font-size: 20rpx;
position: absolute;
- right:42rpx ;
+ right: 42rpx;
bottom: 15rpx;
}
+
.coupons {
width: 100%;
position: relative;
@@ -559,23 +570,25 @@ button::after{ border: none; }
position: relative;
width: 750rpx;
overflow: hidden;
- box-shadow:0px 14px 26px 0px rgba(199,203,211,1);
+ box-shadow: 0px 14px 26px 0px rgba(199, 203, 211, 1);
}
.banner image {
width: 750rpx;
border-radius: 16rpx;
}
-.box{
+
+.box {
width: 100%;
}
+
.act {
position: relative;
background: #fff;
border-radius: 12rpx;
- width:94%;
+ width: 94%;
padding-bottom: 20rpx;
- padding:0 3%;
+ padding: 0 3%;
}
.act text {
@@ -585,7 +598,7 @@ button::after{ border: none; }
.txt001 {
display: block;
font-size: 32rpx;
- color: #3C3C3C;
+ color: #3c3c3c;
letter-spacing: 0;
text-align: left;
line-height: 48rpx;
@@ -593,34 +606,41 @@ button::after{ border: none; }
font-weight: bold;
margin-bottom: 20rpx;
}
-.content{
- font-size: 24rpx;
- color: #A6A6A6;
+
+.content {
+ font-size: 30rpx;
+ color: #a6a6a6;
margin-top: 40rpx;
}
-.num{
+
+.num {
line-height: 50rpx;
}
-.member{
- font-size: 24rpx;
- color: #A6A6A6;
+
+.member {
+ font-size: 30rpx;
+ color: #a6a6a6;
padding-left: 2%;
float: left;
}
-.integral{
+
+.integral {
display: block;
font-size: 24rpx;
- color: #A6A6A6;
+ color: #a6a6a6;
float: left;
margin-left: 20rpx;
}
-.integral text{
+
+.integral text {
float: left;
}
-.integralNum{
- color: #FD782D;
- margin: 0 5rpx 0 10rpx ;
+
+.integralNum {
+ color: #fd782d;
+ margin: 0 5rpx 0 10rpx;
}
+
.txt002 {
font-size: 24rpx;
color: #999;
@@ -636,8 +656,8 @@ button::after{ border: none; }
.proct text:nth-of-type(1) {
display: block;
- font-size: 28rpx;
- color: #FD782D;
+ font-size: 30rpx;
+ color: #fd782d;
letter-spacing: 0;
line-height: 32rpx;
margin-bottom: 20rpx;
@@ -645,7 +665,7 @@ button::after{ border: none; }
.proct text:nth-of-type(2) {
display: block;
- word-wrap:break-word;
+ word-wrap: break-word;
font-size: 26rpx;
color: #6f6f6f;
letter-spacing: 0;
@@ -734,14 +754,16 @@ navigator {
width: 344rpx;
}
-.navigator-hover{
- opacity: 1!important;
- background: #fff!important;
- border-radius:16rpx;
+.navigator-hover {
+ opacity: 1 !important;
+ background: #fff !important;
+ border-radius: 16rpx;
}
-.active{
- opacity: .6;
+
+.active {
+ opacity: 0.6;
}
+
navigator:nth-of-type(2n) {
float: right;
}
@@ -771,9 +793,11 @@ navigator:nth-of-type(2n+1) {
border-top: 1px solid #f6f6f6;
line-height: 87rpx;
}
-.content{
+
+.content {
padding: 0 40rpx 160rpx;
}
+
.posi>view:nth-child(2) text:nth-child(1) {
font-size: 30rpx;
color: #a9a9a9;
@@ -1090,79 +1114,89 @@ scroll-view {
font-size: 26rpx;
line-height: 15rpx;
}
-.signUp{
+
+.signUp {
position: fixed;
bottom: 22rpx;
left: 110rpx;
margin: auto;
- width:556rpx;
+ width: 556rpx;
height: 92rpx;
line-height: 92rpx;
border-radius: 32rpx;
- background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
- color: #FFF;
+ background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
+ color: #fff;
font-size: 30rpx;
text-align: center;
- border:1rpx solid rgba(227,227,227,1);
+ border: 1rpx solid rgba(227, 227, 227, 1);
}
-.signUpHr{
+
+.signUpHr {
position: fixed;
bottom: 22rpx;
left: 100rpx;
margin: auto;
- width:556rpx;
+ width: 556rpx;
height: 92rpx;
line-height: 92rpx;
border-radius: 32rpx;
- background: #CECECE;
- color: #FFF;
+ background: #cecece;
+ color: #fff;
font-size: 30rpx;
text-align: center;
- border:1rpx solid rgba(227,227,227,1);
+ border: 1rpx solid rgba(227, 227, 227, 1);
}
-.opacity{
- opacity: .8;
+
+.opacity {
+ opacity: 0.8;
}
-.time{
- font-size: 24rpx;
+
+.time {
+ font-size: 30rpx;
line-height: 50rpx;
- color: #A6A6A6;
+ color: #a6a6a6;
padding-left: 2%;
}
-.ques{
+
+.ques {
display: block;
text-align: center;
}
-.questionTitle{
+
+.questionTitle {
width: 180rpx;
font-size: 40rpx;
- border-top:6rpx solid orange;
+ border-top: 6rpx solid orange;
margin: 20rpx auto 0;
}
-.detail{
- font-size: 26rpx;
+
+.detail {
+ font-size: 30rpx !important;
line-height: 40rpx;
margin-bottom: 20rpx;
color: #666;
}
-.fenxiang{
+.fenxiang {
position: absolute;
top: 3.2%;
right: 27rpx;
display: flex;
flex-direction: column;
}
+
.fenxiang image {
- width:48rpx;
+ width: 48rpx;
height: 48rpx;
margin: 0 auto;
}
-.gift{
- color: #3C3C3C;
+
+.gift {
+ color: #3c3c3c;
font-size: 20rpx;
margin: 0 auto;
}
+
.modal {
width: 100%;
height: 100%;
@@ -1206,4 +1240,4 @@ scroll-view {
margin-top: 40rpx;
width: 90rpx;
height: 90rpx;
-}
\ No newline at end of file
+}
diff --git a/pages/topicDetail/index.wxml b/pages/topicDetail/index.wxml
index e65d488..715da83 100644
--- a/pages/topicDetail/index.wxml
+++ b/pages/topicDetail/index.wxml
@@ -14,7 +14,7 @@
{{data.content}}
-
+
diff --git a/pages/topicDetail/index.wxss b/pages/topicDetail/index.wxss
index 9d13cad..50b4549 100644
--- a/pages/topicDetail/index.wxss
+++ b/pages/topicDetail/index.wxss
@@ -47,7 +47,7 @@
}
.txt002 {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #999;
letter-spacing: 0;
text-align: left;
@@ -62,7 +62,7 @@
.proct text:nth-of-type(1) {
display: block;
- font-size: 30rpx;
+ font-size: 24rpx;
letter-spacing: 0;
line-height: 42rpx;
margin-bottom: 20rpx;
diff --git a/project.config.json b/project.config.json
index 61c3692..972dd73 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,7 +1,8 @@
{
"description": "项目配置文件",
"packOptions": {
- "ignore": []
+ "ignore": [],
+ "include": []
},
"setting": {
"urlCheck": true,
@@ -31,33 +32,19 @@
"useIsolateContext": true
},
"compileType": "miniprogram",
- "libVersion": "2.12.3",
- "appid": "wxfa336cad86ed598d",
+ "libVersion": "2.11.2",
+ "appid": "wx453ae0d37f3550d0",
"projectname": "oldC",
- "isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
+ "editorSetting": {
+ "tabIndent": "insertSpaces",
+ "tabSize": 2
+ },
"condition": {
- "search": {
- "list": []
- },
- "conversation": {
- "list": []
- },
- "plugin": {
- "list": []
- },
- "game": {
- "currentL": -1,
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
"miniprogram": {
"list": [
{
- "id": 0,
"name": "pages/index/index",
"pathName": "pages/index/index",
"query": "orderId=653810672414679040&from=discount&composeOrderType=0",
@@ -65,14 +52,12 @@
"referrerInfo": {}
},
{
- "id": 8,
"name": "pages/questionnaire/questionnaireLsit/questionnaireLsit",
"pathName": "pages/questionnaire/questionnaireLsit/questionnaireLsit",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "index/index",
"pathName": "index/index",
"query": "",
@@ -80,21 +65,18 @@
"referrerInfo": {}
},
{
- "id": 3,
"name": "pages/main/index",
"pathName": "pages/main/index",
"query": "type=cd&couponChannelId=684973014355992576",
"scene": null
},
{
- "id": -1,
"name": "pages/siteUser/siteUser",
"pathName": "pages/siteUser/siteUser",
"query": "",
"scene": null
},
{
- "id": 5,
"name": "pages/index/index",
"pathName": "pages/index/index",
"query": "",
@@ -102,7 +84,6 @@
"referrerInfo": {}
},
{
- "id": 6,
"name": "pages/freeBannerDetail/index",
"pathName": "pages/freeBannerDetail/index",
"query": "id= 690072721969307648",
diff --git a/project.private.config.json b/project.private.config.json
new file mode 100644
index 0000000..906ca65
--- /dev/null
+++ b/project.private.config.json
@@ -0,0 +1,7 @@
+{
+ "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+ "projectname": "C",
+ "setting": {
+ "compileHotReLoad": true
+ }
+}
\ No newline at end of file
diff --git a/test.png b/test.png
new file mode 100644
index 0000000..618c8b2
Binary files /dev/null and b/test.png differ