From cdde285c830368d94e39d00456cb02628746f724 Mon Sep 17 00:00:00 2001 From: jianweie Date: Wed, 22 May 2024 20:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=BB=86=E8=8A=82=E5=8F=8A=E6=89=93=E5=8C=85=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B70.7.4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Uni-App/CoreShop/App.vue | 2 +- CoreCms.Net.Uni-App/CoreShop/manifest.json | 348 +++++++++--------- .../CoreShop/pages/category/index/index.vue | 7 +- CoreCms.Net.Web.Admin/appsettings.json | 2 +- .../wwwroot/lib/layuiAdmin/config.js | 2 +- CoreCms.Net.Web.WebApi/appsettings.json | 2 +- 6 files changed, 181 insertions(+), 182 deletions(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/App.vue b/CoreCms.Net.Uni-App/CoreShop/App.vue index d0e62c45..bb036d7e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/App.vue +++ b/CoreCms.Net.Uni-App/CoreShop/App.vue @@ -11,7 +11,7 @@ }, onLaunch() { //版本设置 - const version = '0.7.3' + const version = '0.7.4' // 开发环境才提示，生产环境不会提示 if (process.env.NODE_ENV === 'development') { console.log(`\n %c \u6838\u5fc3\u5546\u57ce\u7cfb\u7edf\u0020\u0043\u006f\u0072\u0065\u0053\u0068\u006f\u0070 V${version} %c \u0068\u0074\u0074\u0070\u0073\u003a\u002f\u002f\u0077\u0077\u0077\u002e\u0063\u006f\u0072\u0065\u0073\u0068\u006f\u0070\u002e\u0063\u006e\u002f \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #f1f1f1; padding:5px 0;'); diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json index 61bfade1..4edfd36f 100644 --- a/CoreCms.Net.Uni-App/CoreShop/manifest.json +++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json @@ -1,184 +1,186 @@ { - "name" : "核心商城系统", - "appid" : "__UNI__EAACF14", - "description" : "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序", - "versionName" : "1.0", - "versionCode" : 1, - "transformPx" : false, - "app-plus" : { - /* 5+App特有相关 */ - "modules" : { - "Payment" : {}, - "VideoPlayer" : {}, - "Maps" : {} + "name": "核心商城系统", + "appid": "__UNI__EAACF14", + "description": "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序", + "versionName": "1.0", + "versionCode": 1, + "transformPx": false, + "app-plus": { + /* 5+App特有相关 */ + "modules": { + "Payment": {}, + "VideoPlayer": {}, + "Maps": {} + }, + /* 模块配置 */ + "distribute": { + /* 应用发布信息 */ + "android": { + /* android打包配置 */ + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters": [ "armeabi-v7a", "arm64-v8a", "x86" ] + }, + "ios": {}, + /* ios打包配置 */ + "sdkConfigs": { + "payment": { + "weixin": { + "appid": "wx11d95cdaee6058f6" + } }, - /* 模块配置 */ - "distribute" : { - /* 应用发布信息 */ - "android" : { - /* android打包配置 */ - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] - }, - "ios" : {}, - /* ios打包配置 */ - "sdkConfigs" : { - "payment" : { - "weixin" : { - "appid" : "wx11d95cdaee6058f6" - } - }, - "ad" : {}, - "maps" : { - "amap" : { - "appkey_ios" : "91b94ecb48605c4e048aa1971459eca7", - "appkey_android" : "91b94ecb48605c4e048aa1971459eca7" - } - }, - "oauth" : { - "univerify" : {} - }, - "share" : {} - }, - "icons" : { - "android" : { - "hdpi" : "", - "xhdpi" : "", - "xxhdpi" : "", - "xxxhdpi" : "" - }, - "ios" : { - "appstore" : "", - "ipad" : { - "app" : "", - "app@2x" : "", - "notification" : "", - "notification@2x" : "", - "proapp@2x" : "", - "settings" : "", - "settings@2x" : "", - "spotlight" : "", - "spotlight@2x" : "" - }, - "iphone" : { - "app@2x" : "", - "app@3x" : "", - "notification@2x" : "", - "notification@3x" : "", - "settings@2x" : "", - "settings@3x" : "", - "spotlight@2x" : "", - "spotlight@3x" : "" - } - } - } + "ad": {}, + "maps": { + "amap": { + "appkey_ios": "91b94ecb48605c4e048aa1971459eca7", + "appkey_android": "91b94ecb48605c4e048aa1971459eca7" + } }, - "splashscreen" : { - "waiting" : true + "oauth": { + "univerify": {} + }, + "share": {} + }, + "icons": { + "android": { + "hdpi": "", + "xhdpi": "", + "xxhdpi": "", + "xxxhdpi": "" + }, + "ios": { + "appstore": "", + "ipad": { + "app": "", + "app@2x": "", + "notification": "", + "notification@2x": "", + "proapp@2x": "", + "settings": "", + "settings@2x": "", + "spotlight": "", + "spotlight@2x": "" + }, + "iphone": { + "app@2x": "", + "app@3x": "", + "notification@2x": "", + "notification@3x": "", + "settings@2x": "", + "settings@3x": "", + "spotlight@2x": "", + "spotlight@3x": "" + } } + } }, - /* SDK配置 */ - "quickapp" : {}, - /* 快应用特有相关 */ - "mp-weixin" : { - "appid" : "wx6a73f5a508da7af2", - "setting" : { - "urlCheck" : true, - "postcss" : true, - "minified" : true, - "es6" : true, - "checkSiteMap" : false - }, - "plugins" : { - "chooseLocation" : { - "version" : "1.0.10", - "provider" : "wx76a9a06e5b4e693e" //这个appid不要改，用默认是的[wx76a9a06e5b4e693e],这是组件自己的appid，不是你小程序的appid - } - }, - "permission" : { - "scope.userFuzzyLocation" : { - "desc" : "你的位置信息将用于小程序定位" - }, - "scope.userLocation" : { - "desc" : "你的位置信息将用于小程序定位" - } - }, - "optimization" : { - "subPackages" : true - }, - "requiredPrivateInfos" : [ "getFuzzyLocation", "chooseAddress" ] + "splashscreen": { + "waiting": true + } + }, + /* SDK配置 */ + "quickapp": {}, + /* 快应用特有相关 */ + "mp-weixin": { + "appid": "wx6a73f5a508da7af2", + "setting": { + "urlCheck": true, + "postcss": true, + "minified": true, + "es6": true, + "checkSiteMap": false }, - "h5" : { - "title" : "南山田舍", - "domain" : "https://h5.demo.coreshop.cn", - "router" : { - "base" : "./", - "mode" : "hash" - }, - "template" : "index.html", - "devServer" : { - "port" : 80, - "disableHostCheck" : true, - "https" : true - }, - "sdkConfigs" : { - "maps" : { - "qqmap" : { - "key" : "AEIBZ-H5TRI-A6VGA-5KRNA-QKKK6-JGB33" - } - } - }, - "optimization" : { - "treeShaking" : { - "enable" : false - } + "plugins": { + "chooseLocation": { + "version": "1.0.10", + "provider": "wx76a9a06e5b4e693e" //这个appid不要改，用默认是的[wx76a9a06e5b4e693e],这是组件自己的appid，不是你小程序的appid + } + }, + "permission": { + "scope.userFuzzyLocation": { + "desc": "你的位置信息将用于小程序定位" + }, + "scope.userLocation": { + "desc": "你的位置信息将用于小程序定位" + } + }, + "optimization": { + "subPackages": true + }, + "requiredPrivateInfos": [ "getFuzzyLocation", "chooseAddress" ], + "libVersion": "latest" + + }, + "h5": { + "title": "南山田舍", + "domain": "https://h5.demo.coreshop.cn", + "router": { + "base": "./", + "mode": "hash" + }, + "template": "index.html", + "devServer": { + "port": 80, + "disableHostCheck": true, + "https": true + }, + "sdkConfigs": { + "maps": { + "qqmap": { + "key": "AEIBZ-H5TRI-A6VGA-5KRNA-QKKK6-JGB33" } + } }, - "mp-toutiao" : { - "setting" : { - "es6" : true, - "postcss" : true, - "minified" : true - }, - "appid" : "" + "optimization": { + "treeShaking": { + "enable": false + } + } + }, + "mp-toutiao": { + "setting": { + "es6": true, + "postcss": true, + "minified": true }, - "mp-qq" : { - "setting" : { - "es6" : true, - "postcss" : true, - "minified" : true - }, - "optimization" : { - "subPackages" : true - } + "appid": "" + }, + "mp-qq": { + "setting": { + "es6": true, + "postcss": true, + "minified": true }, - "mp-alipay" : { - "appid" : "2021004107611929" - }, - "mp-baidu" : {} + "optimization": { + "subPackages": true + } + }, + "mp-alipay": { + "appid": "2021004107611929" + }, + "mp-baidu": {} } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue index 730e3397..2159db85 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue @@ -139,8 +139,7 @@ - + {{ item.name }} @@ -178,8 +177,7 @@ v-for="(item, index) in secondaryClassification" :key="index" @tap="handleMenuTapNew(item.id)"> - + {{ item.name }} @@ -418,7 +416,6 @@ export default { }, handleMenuTapNew(id) { const _this = this; - _this.scrollLeftSticky = 0; let menu = _this.menus[_this.primaryClassificationIndex].child.filter((res) => res.id == id); _this.needCurrentCateId = menu[0].id; _this.currentCateId = menu[0].id; diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json index c3285206..aaaead47 100644 --- a/CoreCms.Net.Web.Admin/appsettings.json +++ b/CoreCms.Net.Web.Admin/appsettings.json @@ -18,7 +18,7 @@ "AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址 "AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址 "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址 - "AppVersion": "CoreShopProfessional v0.7.3" + "AppVersion": "CoreShopProfessional v0.7.4" }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": { diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js index ed80c97a..78296d9d 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js @@ -24,7 +24,7 @@ layui.define(['all'], function (exports) { refreshCurrPage: true, // 当跳转页面 url 与当前页 url 相同时，是否自动执行刷新 name: '核心商城系统', - version: 'CoreShopProfessional v0.7.3', + version: 'CoreShopProfessional v0.7.4', name: 'layuiAdmin', tableName: 'CoreShop', // 本地存储表名 MOD_NAME: 'admin', // 模块事件名 diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json index 81bb889d..7d13c710 100644 --- a/CoreCms.Net.Web.WebApi/appsettings.json +++ b/CoreCms.Net.Web.WebApi/appsettings.json @@ -25,7 +25,7 @@ "AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址 "AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址 "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址 - "AppVersion": "CoreShopProfessional v0.7.3" + "AppVersion": "CoreShopProfessional v0.7.4" }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": {