diff --git a/manifest.json b/manifest.json index 24f74252..5b548de6 100644 --- a/manifest.json +++ b/manifest.json @@ -1,40 +1,40 @@ { - "name" : "ShopXO", - "appid" : "__UNI__50E3C11", - "description" : "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求", - "versionName" : "1.0.0", - "versionCode" : 100, - "transformPx" : false, - "app-plus" : { - "usingComponents" : true, - "nvueCompiler" : "uni-app", + "name": "ShopXO", + "appid": "__UNI__50E3C11", + "description": "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求", + "versionName": "1.0.0", + "versionCode": 100, + "transformPx": false, + "app-plus": { + "usingComponents": true, + "nvueCompiler": "uni-app", "nvueStyleCompiler": "uni-app", - "compilerVersion" : 3, + "compilerVersion": 3, "safearea": { - "bottom": { + "bottom": { "offset": "none" } }, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 }, - "modules" : { - "Payment" : {}, - "Barcode" : {}, - "OAuth" : {}, - "Maps" : {}, - "Geolocation" : {}, - "Share" : {}, - "VideoPlayer" : {}, - "Camera" : {}, - "LivePusher" : {} + "modules": { + "Payment": {}, + "Barcode": {}, + "OAuth": {}, + "Maps": {}, + "Geolocation": {}, + "Share": {}, + "VideoPlayer": {}, + "Camera": {}, + "LivePusher": {} }, - "distribute" : { - "android" : { - "permissions" : [ + "distribute": { + "android": { + "permissions": [ "", "", "", @@ -60,117 +60,129 @@ "", "" ], - "targetSdkVersion" : 30, - "minSdkVersion" : 23 + "targetSdkVersion": 30, + "minSdkVersion": 23 }, - "ios" : { - "dSYMs" : false, - "privacyDescription" : { - "NSPhotoLibraryUsageDescription" : "获取用户手机相册用于提供相册图片素材", - "NSPhotoLibraryAddUsageDescription" : "将图片保存至手机相册", - "NSCameraUsageDescription" : "获取用户手机相册用于快捷拍照功能", - "NSLocationWhenInUseUsageDescription" : "该应用需要您的地理位置,以便为你提供当前位置信息", - "NSLocationAlwaysUsageDescription" : "该应用需要您的地理位置,以便为你提供当前位置信息", - "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要持续获取用户地理位置,以便为您提供实时的位置信息" + "ios": { + "dSYMs": false, + "privacyDescription": { + "NSPhotoLibraryUsageDescription": "获取用户手机相册用于提供相册图片素材", + "NSPhotoLibraryAddUsageDescription": "将图片保存至手机相册", + "NSCameraUsageDescription": "获取用户手机相册用于快捷拍照功能", + "NSLocationWhenInUseUsageDescription": "该应用需要您的地理位置,以便为你提供当前位置信息", + "NSLocationAlwaysUsageDescription": "该应用需要您的地理位置,以便为你提供当前位置信息", + "NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要持续获取用户地理位置,以便为您提供实时的位置信息" } }, - "sdkConfigs" : { - "payment" : { - "alipay" : { - "__platform__" : [ "ios", "android" ] + "sdkConfigs": { + "payment": { + "alipay": { + "__platform__": [ + "ios", + "android" + ] }, - "weixin" : { - "__platform__" : [ "ios", "android" ], - "appid" : "wx3bac19ff90c0a976", - "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + "weixin": { + "__platform__": [ + "ios", + "android" + ], + "appid": "wx3bac19ff90c0a976", + "UniversalLinks": "https://d1.shopxo.vip/.well-known/" }, - "paypal" : { - "__platform__" : [ "ios", "android" ], - "returnURL_ios" : "com.shopxo.mm://paypal", - "returnURL_android" : "com.shopxo.mm://paypal" + "paypal": { + "__platform__": [ + "ios", + "android" + ], + "returnURL_ios": "com.shopxo.mm://paypal", + "returnURL_android": "com.shopxo.mm://paypal" } }, - "ad" : {}, - "oauth" : { - "univerify" : {}, - "apple" : {}, - "weixin" : { - "appid" : "wx3bac19ff90c0a976", - "appsecret" : "91f132b39c5c575fe61b04993c57c734", - "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + "ad": {}, + "oauth": { + "univerify": {}, + "apple": {}, + "weixin": { + "appid": "wx3bac19ff90c0a976", + "appsecret": "91f132b39c5c575fe61b04993c57c734", + "UniversalLinks": "https://d1.shopxo.vip/.well-known/" }, - "qq" : { - "appid" : "102076195", - "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + "qq": { + "appid": "102076195", + "UniversalLinks": "https://d1.shopxo.vip/.well-known/" }, - "google" : { - "clientid" : "510187709509-fq3t5grcfh81t4ub491tiadrtfjbaes1.apps.googleusercontent.com" + "google": { + "clientid": "510187709509-fq3t5grcfh81t4ub491tiadrtfjbaes1.apps.googleusercontent.com" } }, - "maps" : { - "amap" : { - "name" : "amapu9VF72Gg", - "appkey_ios" : "f55e9099897821681f5c74051e4527bd", - "appkey_android" : "ebe9f1d84f8ceb8b3c4ba6ead2bfa78b" + "maps": { + "amap": { + "name": "amapu9VF72Gg", + "appkey_ios": "f55e9099897821681f5c74051e4527bd", + "appkey_android": "ebe9f1d84f8ceb8b3c4ba6ead2bfa78b" } }, - "geolocation" : { - "system" : { - "__platform__" : [ "ios", "android" ] + "geolocation": { + "system": { + "__platform__": [ + "ios", + "android" + ] } }, - "share" : { - "weixin" : { - "appid" : "wx3bac19ff90c0a976", - "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + "share": { + "weixin": { + "appid": "wx3bac19ff90c0a976", + "UniversalLinks": "https://d1.shopxo.vip/.well-known/" }, - "qq" : { - "appid" : "102076195", - "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + "qq": { + "appid": "102076195", + "UniversalLinks": "https://d1.shopxo.vip/.well-known/" } }, - "push" : {} + "push": {} }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" } } }, - "splashscreen" : { - "useOriginalMsgbox" : true + "splashscreen": { + "useOriginalMsgbox": true } } }, - "quickapp" : {}, - "mp-weixin" : { - "requiredPrivateInfos" : [ + "quickapp": {}, + "mp-weixin": { + "requiredPrivateInfos": [ "chooseLocation", "getLocation", "chooseAddress", @@ -178,22 +190,22 @@ "startLocationUpdate", "startLocationUpdateBackground" ], - "appid" : "wxda7779770f53e901", - "setting" : { - "urlCheck" : false, - "es6" : true, - "minified" : true, - "ignoreDevUnusedFiles" : false, - "ignoreUploadUnusedFiles" : false + "appid": "wxda7779770f53e901", + "setting": { + "urlCheck": false, + "es6": true, + "minified": true, + "ignoreDevUnusedFiles": false, + "ignoreUploadUnusedFiles": false }, - "usingComponents" : true, - "permission" : { - "scope.userLocation" : { - "desc" : "你的位置将用于小程序中相应业务位置服务使用" + "usingComponents": true, + "permission": { + "scope.userLocation": { + "desc": "你的位置将用于小程序中相应业务位置服务使用" } }, - "__usePrivacyCheck__" : true, - "plugins" : { + "__usePrivacyCheck__": true, + "plugins": { // 腾讯地图路线规划插件(需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件,教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a) // "routePlan" : { // "version" : "1.0.19", @@ -206,67 +218,67 @@ // } } }, - "mp-alipay" : { - "usingComponents" : true, - "appid" : "2021001173639600" + "mp-alipay": { + "usingComponents": true, + "appid": "2021001173639600" }, - "mp-baidu" : { - "usingComponents" : true, - "appid" : "", - "setting" : { - "urlCheck" : false + "mp-baidu": { + "usingComponents": true, + "appid": "", + "setting": { + "urlCheck": false }, - "dynamicLib" : { + "dynamicLib": { //引入百度小程序动态库 - "editorLib" : { - "provider" : "swan-editor" + "editorLib": { + "provider": "swan-editor" } } }, - "mp-toutiao" : { - "usingComponents" : true, - "appid" : "ttfb628ddf6458b04f", - "setting" : { - "urlCheck" : false + "mp-toutiao": { + "usingComponents": true, + "appid": "ttfb628ddf6458b04f", + "setting": { + "urlCheck": false } }, - "networkTimeout" : { - "request" : 10000, - "downloadFile" : 10000 + "networkTimeout": { + "request": 10000, + "downloadFile": 10000 }, - "mp-qq" : { - "appid" : "1110736292", - "setting" : { - "urlCheck" : false + "mp-qq": { + "appid": "1110736292", + "setting": { + "urlCheck": false }, - "permission" : { - "scope.userLocation" : { - "desc" : "你的位置将用于小程序中相应业务位置服务使用" + "permission": { + "scope.userLocation": { + "desc": "你的位置将用于小程序中相应业务位置服务使用" } } }, - "mp-kuaishou" : { - "appid" : "ks669910446353970565" + "mp-kuaishou": { + "appid": "ks669910446353970565" }, - "h5" : { - "sdkConfigs" : { - "maps" : { - "tencent" : { - "key" : "56SBZ-PCC3G-US2QM-IXYFE-4DE5H-GRBDK" + "h5": { + "sdkConfigs": { + "maps": { + "tencent": { + "key": "XZHBZ-4OUKA-SMSKV-CXXHB-OKOGQ-FSF6U" } } }, - "devServer" : { - "https" : false, - "port" : 8082 + "devServer": { + "https": false, + "port": 8082 }, - "router" : { - "mode" : "hash", - "base" : "./" + "router": { + "mode": "hash", + "base": "./" }, - "title" : "ShopXO", - "template" : "template.h5.html" + "title": "ShopXO", + "template": "template.h5.html" }, - "vueVersion" : "2", - "locale" : "auto" -} + "vueVersion": "2", + "locale": "auto" +} \ No newline at end of file diff --git a/pages/goods-vr-ticket/components/ticket-header/index.vue b/pages/goods-vr-ticket/components/ticket-header/index.vue index 5ef95807..97dd5924 100644 --- a/pages/goods-vr-ticket/components/ticket-header/index.vue +++ b/pages/goods-vr-ticket/components/ticket-header/index.vue @@ -247,16 +247,20 @@ export default { today.setHours(0, 0, 0, 0); const tomorrow = new Date(today); tomorrow.setDate(tomorrow.getDate() + 1); - + const dayAfterTomorrow = new Date(today); + dayAfterTomorrow.setDate(dayAfterTomorrow.getDate() + 2); + const date = new Date(dateStr); date.setHours(0, 0, 0, 0); - + if (date.getTime() === today.getTime()) { return '今日'; } else if (date.getTime() === tomorrow.getTime()) { return '明日'; + } else if (date.getTime() === dayAfterTomorrow.getTime()) { + return '后天'; } - + const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; return weekdays[date.getDay()]; }, @@ -565,14 +569,16 @@ export default { /* 当前商品标签 */ .date-tab-current-tag { position: absolute; - top: -2px; - right: -2px; + top: 0; + right: 0; background: linear-gradient(135deg, #ff404f, #ff6b81); color: #fff; font-size: 9px; padding: 1px 5px; - border-radius: 4px 4px 4px 0; + border-radius: 0 10px 0 4px; font-weight: bold; + line-height: 1.4; + box-shadow: 0 1px 3px rgba(255, 64, 79, 0.4); } /* 已过期状态 */