diff --git a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj
index 9987c226..7436d744 100644
--- a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj
+++ b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj
index 3c05858d..cb9293b4 100644
--- a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj
+++ b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj
index cac706d9..89fb1e38 100644
--- a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj
+++ b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj
index 473010bf..f20c98e9 100644
--- a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj
+++ b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/CoreCms.Net.Core/CoreCms.Net.Core.csproj b/CoreCms.Net.Core/CoreCms.Net.Core.csproj
index c968ea85..d65ff6a4 100644
--- a/CoreCms.Net.Core/CoreCms.Net.Core.csproj
+++ b/CoreCms.Net.Core/CoreCms.Net.Core.csproj
@@ -12,7 +12,7 @@
-
+
@@ -20,13 +20,13 @@
-
+
-
+
-
-
+
+
diff --git a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj
index 943358a9..f6880797 100644
--- a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj
+++ b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj
index 235df4d1..fac61c52 100644
--- a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj
+++ b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.csproj b/CoreCms.Net.Model/CoreCms.Net.Model.csproj
index e2e236b2..33bc774d 100644
--- a/CoreCms.Net.Model/CoreCms.Net.Model.csproj
+++ b/CoreCms.Net.Model/CoreCms.Net.Model.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj
index 765764d3..00a74b97 100644
--- a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj
+++ b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj
@@ -5,10 +5,10 @@
-
-
+
+
-
+
diff --git a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
index dbe95981..97cc9d14 100644
--- a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
+++ b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/CoreCms.Net.Services/CoreCms.Net.Services.csproj b/CoreCms.Net.Services/CoreCms.Net.Services.csproj
index 1ffe2500..073c5245 100644
--- a/CoreCms.Net.Services/CoreCms.Net.Services.csproj
+++ b/CoreCms.Net.Services/CoreCms.Net.Services.csproj
@@ -6,8 +6,8 @@
-
-
+
+
@@ -16,7 +16,7 @@
-
+
diff --git a/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs
index 03470f99..84326054 100644
--- a/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs
+++ b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs
@@ -82,8 +82,8 @@ namespace CoreCms.Net.Services
request.Audit.Category = new ShopAuditAuditCategoryRequest.Types.Audit.Types.Category();
request.Audit.Category.FirstCategoryId = entity.level1;
- request.Audit.Category.SecondCategroyId = entity.level2;
- request.Audit.Category.ThirdCategroyId = entity.level3;
+ request.Audit.Category.SecondCategoryId = entity.level2;
+ request.Audit.Category.ThirdCategoryId = entity.level3;
request.Audit.Category.QualificationUrlList = entity.certificateImage.Split(",").ToList();
diff --git a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj
index f4d99730..8cecda75 100644
--- a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj
+++ b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
index 26026c1e..b52c577b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
@@ -4,7 +4,7 @@
*/
//接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.demo.coreshop.cn
-export const apiBaseUrl = 'https://api.demo.coreshop.cn';
+export const apiBaseUrl = 'https://api.nsts.mvccms.cn';
//项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn
export const apiFilesUrl = 'https://files.cdn.coreshop.cn';
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
index 5df0b8d7..734ee550 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
@@ -47,6 +47,9 @@
// #ifdef H5
window.location.href = val
// #endif
+ // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+ this.$u.route('/pages/webview/webview', { src: val });
+ // #endif
} else {
// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
if (val == '/pages/index/default/default' || val == '/pages/category/index/index' || val == '/pages/index/cart/cart' || val == '/pages/index/member/member') {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json
index d73ecd1c..b29e3a68 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages.json
@@ -215,7 +215,13 @@
"navigationBarTitleText": "打赏"
}
},
-
+ {
+ "path": "pages/webview/webview",
+ "style": {
+ "navigationBarTextStyle": "white",
+ "navigationBarTitleText": "网页详情"
+ }
+ },
{
"path": "pages/template",
"style": {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/webview/webview.vue b/CoreCms.Net.Uni-App/CoreShop/pages/webview/webview.vue
new file mode 100644
index 00000000..df0d63f4
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/webview/webview.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/changelog.md b/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/changelog.md
index 7a54275a..c9b76c92 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/changelog.md
+++ b/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/changelog.md
@@ -1,3 +1,11 @@
+## 2.0.31（2022-04-19）
+# uView2.0重磅发布，利剑出鞘，一统江湖
+
+1. 修复`upload`在`vue`页面上传成功后没有成功标志的问题
+2. 解决演示项目中微信小程序模拟上传图片一直出于上传中问题
+3. 修复`u-code-input`组件在`nvue`页面编译到`app`平台上光标异常问题（`app`去除此功能）
+4. 修复`actionSheet`组件标题关闭按钮点击事件名称错误的问题
+5. 其他修复
## 2.0.30（2022-04-04）
# uView2.0重磅发布，利剑出鞘，一统江湖
diff --git a/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue b/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue
index 98a73d87..26d5d8d9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue
@@ -15,7 +15,7 @@
-
+
+
+
@@ -70,7 +74,8 @@
mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
data() {
return {
- inputValue: ''
+ inputValue: '',
+ isFocus: this.focus
}
},
watch: {
@@ -203,6 +208,7 @@
width: 40px;
background-color: $u-content-color;
}
+ /* #ifndef APP-PLUS */
&__cursor {
position: absolute;
top: 50%;
@@ -212,6 +218,8 @@
height: $u-code-input-cursor-height;
animation: $u-code-input-cursor-animation-duration u-cursor-flicker infinite;
}
+ /* #endif */
+
}
&__input {
@@ -226,6 +234,7 @@
}
}
+ /* #ifndef APP-PLUS */
@keyframes u-cursor-flicker {
0% {
opacity: 0;
@@ -237,4 +246,6 @@
opacity: 0;
}
}
+ /* #endif */
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/components/u-scroll-list/u-scroll-list.vue b/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/components/u-scroll-list/u-scroll-list.vue
index f9085a2a..4fe885a7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/components/u-scroll-list/u-scroll-list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uni_modules/uview-ui/components/u-scroll-list/u-scroll-list.vue
@@ -72,13 +72,11 @@
-
-