From 97809a71e5bc87628a1db7ab074468d50ab94290 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Mon, 17 Oct 2022 14:52:28 +0800 Subject: [PATCH] FirstUpload --- components/commodityMould/commodityMould.wxml | 8 +- components/commodityMould/commodityMould.wxss | 9 +- components/coupons/index.wxml | 14 +- components/coupons/index.wxss | 20 +- components/discountCard/index.wxml | 2 +- components/discountCard/index.wxss | 2 +- components/hot/index.wxml | 12 +- components/hot/index.wxss | 10 +- components/navbar/navbar.wxml | 4 +- components/navbar/navbar.wxss | 6 +- components/optimization/optimization.wxml | 2 +- components/optimization/optimization.wxss | 3 +- custom-tab-bar/index.wxml | 4 +- custom-tab-bar/index.wxss | 4 +- ext.json | 94 +++++++-- pages/fillIndent/fillIndent.json | 2 +- pages/main/coupons/index.wxml | 10 +- pages/main/coupons/index.wxss | 34 ++-- .../questionnaireLsit/questionnaireLsit.json | 2 +- pages/site/site.json | 2 +- pages/siteAdd/siteAdd.json | 2 +- pages/siteUser/siteUser.json | 2 +- pages/siteUser/siteUser.wxml | 10 +- pages/theme/index1/index.json | 18 +- project.config.json | 186 +++++++++--------- project.private.config.json | 3 +- utils/util.js | 8 +- 27 files changed, 270 insertions(+), 203 deletions(-) diff --git a/components/commodityMould/commodityMould.wxml b/components/commodityMould/commodityMould.wxml index 0195757..45b4bcf 100644 --- a/components/commodityMould/commodityMould.wxml +++ b/components/commodityMould/commodityMould.wxml @@ -4,7 +4,7 @@ - + @@ -19,12 +19,12 @@ - +
- + @@ -54,7 +54,7 @@ - + 查看更多优惠活动 diff --git a/components/commodityMould/commodityMould.wxss b/components/commodityMould/commodityMould.wxss index d6e05a7..0f9742f 100644 --- a/components/commodityMould/commodityMould.wxss +++ b/components/commodityMould/commodityMould.wxss @@ -61,7 +61,7 @@ /* background-color: chartreuse; */ } -.topImg image { +.topImg .img { border-radius: 16rpx; width: 100%; height: 100%; @@ -94,7 +94,7 @@ /* background-color: aquamarine; */ } -.itemImg image { +.itemImg .img { width: 100%; height: 100%; border-radius: 16rpx; @@ -207,6 +207,7 @@ color: #999; background: linear-gradient(180deg, #dcb07d 0%, #f5e0bf 100%); -webkit-background-clip: text; + background-clip: text; -webkit-text-fill-color: transparent; margin-left: 8rpx; } @@ -230,7 +231,7 @@ margin: 25% auto 5% auto; } -.noDataImg image { +.noDataImg .img { width: 100%; height: 100%; } @@ -251,7 +252,7 @@ overflow: hidden; } -.product image { +.product .img { height: 100%; display: block; width: 100%; diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml index 1c50a26..d1b8aa3 100644 --- a/components/coupons/index.wxml +++ b/components/coupons/index.wxml @@ -15,7 +15,7 @@ 消费卡 - + {{data.title}} @@ -23,14 +23,14 @@ ¥ - {{data.salePriceStr}} - ¥{{data.priceStr}} + {{data.salePriceStr}} + ¥{{data.priceStr}} 抢购价 - ¥{{data.salePriceStr}} + ¥{{data.salePriceStr}} 可砍至 - ¥{{data.salePriceStr}} + ¥{{data.salePriceStr}} 拼团价 - ¥{{data.salePriceStr}} + ¥{{data.salePriceStr}} @@ -38,7 +38,7 @@ - {{data.priceStr}}小时 + {{data.priceStr}}小时 diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss index 5b80527..abd3cfa 100644 --- a/components/coupons/index.wxss +++ b/components/coupons/index.wxss @@ -7,11 +7,13 @@ overflow: hidden; border-radius: 12rpx; } -.earnest{ + +.earnest { color: red; font-size: 24rpx; padding-left: 10rpx; } + .coupons-border { height: 1rpx; left: 30rpx; @@ -21,7 +23,7 @@ bottom: 0; } -.coupons-img image { +.coupons-img .img { display: block; width: 300rpx; height: 176rpx; @@ -78,7 +80,7 @@ .rmb { font-size: 24rpx !important; margin-right: 4rpx !important; - color: #FD782D!; + color: #FD782D !; } .num { @@ -192,12 +194,12 @@ margin-top: 16rpx; } -.coupons-info-manjian text { +.coupons-info-manjian .text { display: block; line-height: 20rpx; } -.coupons-info-manjian > text:nth-of-type(1) { +.coupons-info-manjian>.text:nth-of-type(1) { display: block; /* color: #FF4949; */ opacity: 0.6; @@ -315,9 +317,9 @@ scroll-view { font-size: 26rpx; } -.navigator:nth-of-type(2n+1) { - /* margin-right: 10rpx; */ -} +/* .navigator:nth-of-type(2n+1) { + margin-right: 10rpx; +} */ .superscript { position: absolute; @@ -369,4 +371,4 @@ scroll-view { display: inline-block; margin-right: 10rpx; font-weight: 400; -} +} \ No newline at end of file diff --git a/components/discountCard/index.wxml b/components/discountCard/index.wxml index feac05e..30d4a1f 100644 --- a/components/discountCard/index.wxml +++ b/components/discountCard/index.wxml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/components/discountCard/index.wxss b/components/discountCard/index.wxss index 2dc0e6c..cf1e40f 100644 --- a/components/discountCard/index.wxss +++ b/components/discountCard/index.wxss @@ -1,4 +1,4 @@ -.content image{ +.content .img { display: block; margin: 30rpx auto 0; border: 1px solid red; diff --git a/components/hot/index.wxml b/components/hot/index.wxml index 3c9e208..d8ac2bc 100644 --- a/components/hot/index.wxml +++ b/components/hot/index.wxml @@ -6,21 +6,21 @@ 爆款专区 - 换一换 - - + 换一换 + + - + {{kData.title}} ¥{{kData.priceStr}} - {{kData.salePriceStr}} + {{kData.salePriceStr}} 砍价 @@ -42,7 +42,7 @@ {{pData.title}} ¥{{pData.priceStr}} - {{pData.salePriceStr}} + {{pData.salePriceStr}} 拼团 diff --git a/components/hot/index.wxss b/components/hot/index.wxss index 9543151..30bf798 100644 --- a/components/hot/index.wxss +++ b/components/hot/index.wxss @@ -16,18 +16,18 @@ .titleL .titleR{ width: 100rpx; } -.titleR text{ +.titleR .text{ float: left; margin-right: 10rpx; font-family:PingFangSC-Regular!important; } -.titleR view{ +.titleR .view{ height: 40rpx; width: 40rpx; /* margin-top: 10rpx; */ float: left; } -.titleR image{ +.titleR .img{ height: 28rpx; width: 28rpx; } @@ -57,7 +57,7 @@ .pintuan{ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); } -.hotCon image{ +.hotCon .img{ width: 86rpx; height: 86rpx; margin: 24rpx 0 46rpx 16rpx; @@ -128,6 +128,6 @@ text-overflow: ellipsis; overflow: hidden; } -.sale text{ +.sale .price{ font-size: 20rpx!important; } diff --git a/components/navbar/navbar.wxml b/components/navbar/navbar.wxml index ec83c6f..4c58ba7 100644 --- a/components/navbar/navbar.wxml +++ b/components/navbar/navbar.wxml @@ -2,8 +2,8 @@ - - + + diff --git a/components/navbar/navbar.wxss b/components/navbar/navbar.wxss index ae3096b..d778feb 100644 --- a/components/navbar/navbar.wxss +++ b/components/navbar/navbar.wxss @@ -27,17 +27,17 @@ background: #fff!important; } -.capsule > view { +.capsule > .view { width: 35px; height: 60%; position: relative; } -.capsule > view:nth-child(2) { +.capsule > .view:nth-child(2) { border-left: 1px solid #777; } -.capsule image { +.capsule .img { width: 70%; height: 100%; position: absolute; diff --git a/components/optimization/optimization.wxml b/components/optimization/optimization.wxml index 81acd2b..6a43942 100644 --- a/components/optimization/optimization.wxml +++ b/components/optimization/optimization.wxml @@ -16,7 +16,7 @@ - + {{item.title}} diff --git a/components/optimization/optimization.wxss b/components/optimization/optimization.wxss index 680d533..f397980 100644 --- a/components/optimization/optimization.wxss +++ b/components/optimization/optimization.wxss @@ -74,6 +74,7 @@ text-align: center; background: linear-gradient(180deg, #cc9a60 0%, #dfbf8e 100%); -webkit-background-clip: text; + background-clip: text; -webkit-text-fill-color: transparent; margin: 20rpx auto 10rpx auto; } @@ -112,7 +113,7 @@ border-radius: 20rpx; /* background-color: aquamarine; */ } -.itemImg image{ +.itemImg .img{ width: 100%; height: 100%; border-radius: 20rpx 20rpx 0 0; diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index 5340c7c..5fc6d13 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -2,7 +2,7 @@ - - {{item.text}} + + {{item.text}} diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss index 1bb4d4b..a347dac 100644 --- a/custom-tab-bar/index.wxss +++ b/custom-tab-bar/index.wxss @@ -30,11 +30,11 @@ flex-direction: column; } -.tab-bar-item image { +.tab-bar-item .img { width: 46rpx; height: 46rpx; } -.tab-bar-item view { +.tab-bar-item .view { font-size: 20rpx; } diff --git a/ext.json b/ext.json index 26ac5c3..34dfe10 100644 --- a/ext.json +++ b/ext.json @@ -1,43 +1,91 @@ { "ext": { "attr": { - "configUrl": "https://btest.malls.iformall.com", - "datatowerurl": "https://mobiletest.malls.iformall.com" + "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" }, - "name": "金泸商务商家版", - "weappId": "wx9ff823abeef23b94", - "appVersion": "Btest.5.1.0" + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", + "appVersion": "C.test.5.2.0" }, "debug": false, "tabBar": { "list": [ { "text": "首页", - "iconPath": "static/images/home-n.png", - "pagePath": "pages/main/main", - "selectedIconPath": "static/images/home-y.png" + "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" }, { - "text": "账单", - "iconPath": "static/images/bill.png", - "pagePath": "pages/bill/bill", - "selectedIconPath": "static/images/bill1.png" + "text": "停车", + "iconPath": "assets/images/park.png", + "pagePath": "index/passCar", + "selectedIconPath": "assets/images/park-a.png" }, { "text": "我的", - "iconPath": "static/images/user-n.png", - "pagePath": "pages/mine/mine", - "selectedIconPath": "static/images/user-y.png" + "iconPath": "assets/images/user.png", + "pagePath": "index/user", + "selectedIconPath": "assets/images/user-a.png" } ], - "color": "#9F9F9F", - "selectedColor": "#52a0fd" + "color": "#abb1be", + "selectedColor": "#b2743d" }, "window": { - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#52A0FD" + "backgroundTextStyle": "dark", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#FFFFFF" }, - "extAppid": "wx9ff823abeef23b94", + "plugins": { + "auto-points-plugin": { + "version": "1.3.0", + "provider": "wxfab2bf944bfc4da6" + }, + "live-player-plugin": { + "version": "1.3.4", + "provider": "wx2b03c6e691cd7370" + } + }, + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { @@ -48,5 +96,9 @@ "networkTimeout": { "request": 30000, "downloadFile": 10000 - } + }, + "requiredPrivateInfos": [ + "chooseLocation", + "getLocation" + ] } \ No newline at end of file diff --git a/pages/fillIndent/fillIndent.json b/pages/fillIndent/fillIndent.json index cedc479..bc5c6fb 100644 --- a/pages/fillIndent/fillIndent.json +++ b/pages/fillIndent/fillIndent.json @@ -1,5 +1,5 @@ { "usingComponents": { - "navbar": "../components/navbar/navbar" + "navbar": "/components/navbar/navbar" } } \ No newline at end of file diff --git a/pages/main/coupons/index.wxml b/pages/main/coupons/index.wxml index c05f26a..dfba871 100644 --- a/pages/main/coupons/index.wxml +++ b/pages/main/coupons/index.wxml @@ -6,10 +6,12 @@ - - 请您敬请期待 - 我们正在筹备一大波优惠活动 + + 请您敬请期待 + 我们正在筹备一大波优惠活动 + + + {{content}} - {{content}} {{loadingtext}} \ No newline at end of file diff --git a/pages/main/coupons/index.wxss b/pages/main/coupons/index.wxss index f17c048..59973ae 100644 --- a/pages/main/coupons/index.wxss +++ b/pages/main/coupons/index.wxss @@ -1,12 +1,15 @@ @import "../../../app.wxss"; + .index-coupons { padding: 0 20rpx; /* margin-top: 40rpx; */ /* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */ } - i-tabs i-tabs-scroll { - background: #F4F5F9!important; - } + +i-tabs i-tabs-scroll { + background: #F4F5F9 !important; +} + .loading { text-align: center; height: 80rpx; @@ -14,17 +17,21 @@ font-size: 26rpx; color: #999; } -.coupons c-coupons{ + +.coupons c-coupons { height: 354rpx; margin-bottom: 34rpx; } -.coupons c-coupons:nth-of-type(2n+1){ + +.coupons c-coupons:nth-of-type(2n+1) { float: left; } -.coupons c-coupons:nth-of-type(2n){ + +.coupons c-coupons:nth-of-type(2n) { float: right; } -.loading image { + +.loading .img { width: 60rpx; height: 60rpx; vertical-align: middle; @@ -35,7 +42,7 @@ margin-top: 33rpx; } */ -.dingdan text:nth-of-type(1) { +.dingdan .text:nth-of-type(1) { display: block; font-size: 34rpx; color: #333; @@ -43,7 +50,7 @@ text-align: center; } -.dingdan text:nth-of-type(2) { +.dingdan .text:nth-of-type(2) { display: block; font-size: 28rpx; color: #999; @@ -51,15 +58,16 @@ text-align: center; } -.dingdan image { +.dingdan .img { display: block; width: 300rpx; height: 300rpx; margin: 0 auto 16rpx; } -.loadingtext{ + +.loadingtext { text-align: center; color: #888; font-size: 30rpx; - margin-top:30rpx; -} + margin-top: 30rpx; +} \ No newline at end of file diff --git a/pages/questionnaire/questionnaireLsit/questionnaireLsit.json b/pages/questionnaire/questionnaireLsit/questionnaireLsit.json index 672657b..a1fed8f 100644 --- a/pages/questionnaire/questionnaireLsit/questionnaireLsit.json +++ b/pages/questionnaire/questionnaireLsit/questionnaireLsit.json @@ -1,6 +1,6 @@ { "usingComponents": { - "navbar": "../../components/navbar/navbar" + "navbar": "/components/navbar/navbar" }, "navigationBarBackgroundColor": "#FD832D", "navigationBarTextStyle": "white" diff --git a/pages/site/site.json b/pages/site/site.json index cedc479..bc5c6fb 100644 --- a/pages/site/site.json +++ b/pages/site/site.json @@ -1,5 +1,5 @@ { "usingComponents": { - "navbar": "../components/navbar/navbar" + "navbar": "/components/navbar/navbar" } } \ No newline at end of file diff --git a/pages/siteAdd/siteAdd.json b/pages/siteAdd/siteAdd.json index cedc479..bc5c6fb 100644 --- a/pages/siteAdd/siteAdd.json +++ b/pages/siteAdd/siteAdd.json @@ -1,5 +1,5 @@ { "usingComponents": { - "navbar": "../components/navbar/navbar" + "navbar": "/components/navbar/navbar" } } \ No newline at end of file diff --git a/pages/siteUser/siteUser.json b/pages/siteUser/siteUser.json index cedc479..bc5c6fb 100644 --- a/pages/siteUser/siteUser.json +++ b/pages/siteUser/siteUser.json @@ -1,5 +1,5 @@ { "usingComponents": { - "navbar": "../components/navbar/navbar" + "navbar": "/components/navbar/navbar" } } \ No newline at end of file diff --git a/pages/siteUser/siteUser.wxml b/pages/siteUser/siteUser.wxml index 0b58abc..947abce 100644 --- a/pages/siteUser/siteUser.wxml +++ b/pages/siteUser/siteUser.wxml @@ -2,16 +2,16 @@ - + 默认 - {{item.consignee}} {{item.mobile}} + {{item.consignee}} {{item.mobile}} - + {{item.regionSty}} {{item.address}} - - + + +新建收货地址 \ No newline at end of file diff --git a/pages/theme/index1/index.json b/pages/theme/index1/index.json index 6822e77..dd8d93c 100644 --- a/pages/theme/index1/index.json +++ b/pages/theme/index1/index.json @@ -1,14 +1,14 @@ { "usingComponents": { - "c-banner": "../components/banner/index", - "discount-card": "../components/discountCard/index", - "c-coupons": "../pages/main/coupons/index", - "g-entry": "../components/gameentry/gentry", - "c-hot": "../components/hot/index", - "c-advertisement": "../components/advertisement/advertisement", - "navbar": "../components/navbar/navbar", - "c-mould": "../components/commodityMould/commodityMould", - "optimization": "../components/optimization/optimization" + "c-banner": "/components/banner/index", + "discount-card": "/components/discountCard/index", + "c-coupons": "/pages/main/coupons/index", + "g-entry": "/components/gameentry/gentry", + "c-hot": "/components/hot/index", + "c-advertisement": "/components/advertisement/advertisement", + "navbar": "/components/navbar/navbar", + "c-mould": "/components/commodityMould/commodityMould", + "optimization": "/components/optimization/optimization" }, "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#F4F5F9" diff --git a/project.config.json b/project.config.json index 972dd73..10554b1 100644 --- a/project.config.json +++ b/project.config.json @@ -1,95 +1,95 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [], - "include": [] - }, - "setting": { - "urlCheck": true, - "es6": true, - "enhance": false, - "postcss": true, - "minified": true, - "newFeature": true, - "coverView": true, - "nodeModules": false, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "minifyWXML": true, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": true, - "useIsolateContext": true - }, - "compileType": "miniprogram", - "libVersion": "2.11.2", - "appid": "wx453ae0d37f3550d0", - "projectname": "oldC", - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 2 - }, - "condition": { - "miniprogram": { - "list": [ - { - "name": "pages/index/index", - "pathName": "pages/index/index", - "query": "orderId=653810672414679040&from=discount&composeOrderType=0", - "scene": 1036, - "referrerInfo": {} - }, - { - "name": "pages/questionnaire/questionnaireLsit/questionnaireLsit", - "pathName": "pages/questionnaire/questionnaireLsit/questionnaireLsit", - "query": "", - "scene": null - }, - { - "name": "index/index", - "pathName": "index/index", - "query": "", - "scene": 1036, - "referrerInfo": {} - }, - { - "name": "pages/main/index", - "pathName": "pages/main/index", - "query": "type=cd&couponChannelId=684973014355992576", - "scene": null - }, - { - "name": "pages/siteUser/siteUser", - "pathName": "pages/siteUser/siteUser", - "query": "", - "scene": null - }, - { - "name": "pages/index/index", - "pathName": "pages/index/index", - "query": "", - "scene": 1036, - "referrerInfo": {} - }, - { - "name": "pages/freeBannerDetail/index", - "pathName": "pages/freeBannerDetail/index", - "query": "id= 690072721969307648", - "scene": null - } - ] - } - } + "description": "项目配置文件", + "packOptions": { + "ignore": [], + "include": [] + }, + "setting": { + "urlCheck": true, + "es6": true, + "enhance": false, + "postcss": true, + "minified": true, + "newFeature": true, + "coverView": true, + "nodeModules": false, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "minifyWXML": true, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, + "useIsolateContext": true + }, + "compileType": "miniprogram", + "libVersion": "2.11.2", + "appid": "wxfa116c4a29453fc9", + "projectname": "oldC", + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + }, + "condition": { + "miniprogram": { + "list": [ + { + "name": "pages/index/index", + "pathName": "pages/index/index", + "query": "orderId=653810672414679040&from=discount&composeOrderType=0", + "scene": 1036, + "referrerInfo": {} + }, + { + "name": "pages/questionnaire/questionnaireLsit/questionnaireLsit", + "pathName": "pages/questionnaire/questionnaireLsit/questionnaireLsit", + "query": "", + "scene": null + }, + { + "name": "index/index", + "pathName": "index/index", + "query": "", + "scene": 1036, + "referrerInfo": {} + }, + { + "name": "pages/main/index", + "pathName": "pages/main/index", + "query": "type=cd&couponChannelId=684973014355992576", + "scene": null + }, + { + "name": "pages/siteUser/siteUser", + "pathName": "pages/siteUser/siteUser", + "query": "", + "scene": null + }, + { + "name": "pages/index/index", + "pathName": "pages/index/index", + "query": "", + "scene": 1036, + "referrerInfo": {} + }, + { + "name": "pages/freeBannerDetail/index", + "pathName": "pages/freeBannerDetail/index", + "query": "id= 690072721969307648", + "scene": null + } + ] + } + } } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 906ca65..c253fce 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -3,5 +3,6 @@ "projectname": "C", "setting": { "compileHotReLoad": true - } + }, + "libVersion": "2.11.2" } \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index eb1810e..c467372 100644 --- a/utils/util.js +++ b/utils/util.js @@ -24,10 +24,10 @@ function convertUTCTimeToLocalTime(UTCDateString) { return dateStr; } -function fmtDate(date) { - var dateee = new Date(date).toJSON(); - return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, ''); -} +// function fmtDate(date) { +// var dateee = new Date(date).toJSON(); +// return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, ''); +// } function toHHmmss(date) {//传入时间戳获取时分秒 var time;