diff --git a/uni-app/src/addon/components/diy/group/index.vue b/uni-app/src/addon/components/diy/group/index.vue
index 91adcee10..39332753b 100644
--- a/uni-app/src/addon/components/diy/group/index.vue
+++ b/uni-app/src/addon/components/diy/group/index.vue
@@ -9,7 +9,7 @@
@click="diyStore.changeCurrentIndex(index, component)"
:class="diyGroup.getComponentClass(index,component)" :style="component.pageStyle"
>
-
+
-
-
-
@@ -135,7 +132,6 @@
diff --git a/uni-app/src/app/pages/setting/index.vue b/uni-app/src/app/pages/setting/index.vue
index ec6db49c2..9f8de7645 100644
--- a/uni-app/src/app/pages/setting/index.vue
+++ b/uni-app/src/app/pages/setting/index.vue
@@ -5,6 +5,14 @@
+
+
+
+ 立即升级
+
+
+
+
@@ -26,10 +38,30 @@
import { ref, reactive, computed } from 'vue'
import useMemberStore from '@/stores/member'
import { t, language } from '@/locale'
+import updateVersion from '@/components/update-version/update-version.vue'
+import useSystemStore from '@/stores/system';
const memberStore = useMemberStore()
+const systemStore = useSystemStore();
+const versionInfo = computed(() => {
+ return systemStore.versionInfo
+})
+
const version = ref(import.meta.env.VITE_APP_VERSION)
+// #ifdef APP
+plus.runtime.getProperty(plus.runtime.appid, (inf) => {
+ // 获取版本号
+ version.value = inf.version
+})
+// #endif
+// #ifndef APP
+//获取当前app的版本
+const systemInfo = uni.getSystemInfoSync();
+version.value = systemInfo.appVersion;
+// #endif
+
+const updateVersionRef: any = ref(null)
/**
* 支持的语言列表
@@ -52,6 +84,18 @@ const lang = computed(() => {
const switchLang = (lang) => {
language.loadAllLocaleMessages('app', lang.value)
}
+
+const checkUpdate = ()=>{
+ if(versionInfo.value && versionInfo.value.version_name){
+ systemStore.showUpdateVersion()
+ // uni.$emit('showUpdateVersion',{})
+ }else{
+ uni.showToast({
+ title: '当前版本已是最新版本!',
+ icon: 'none'
+ });
+ }
+}
\ No newline at end of file
+
diff --git a/uni-app/src/components/information-filling/information-filling.vue b/uni-app/src/components/information-filling/information-filling.vue
index 63463775a..bed5bdb4f 100644
--- a/uni-app/src/components/information-filling/information-filling.vue
+++ b/uni-app/src/components/information-filling/information-filling.vue
@@ -20,13 +20,13 @@
-
+
-
+
-
-
+
+
diff --git a/uni-app/src/components/music/music-container.vue b/uni-app/src/components/music/music-container.vue
index a74bb4f9e..da0a6df06 100644
--- a/uni-app/src/components/music/music-container.vue
+++ b/uni-app/src/components/music/music-container.vue
@@ -1,25 +1,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
+
+
\ No newline at end of file
diff --git a/uni-app/src/components/nc-contact/nc-contact.vue b/uni-app/src/components/nc-contact/nc-contact.vue
index 69b3d587c..0b873e809 100644
--- a/uni-app/src/components/nc-contact/nc-contact.vue
+++ b/uni-app/src/components/nc-contact/nc-contact.vue
@@ -58,7 +58,7 @@ const siteInfo: any = computed(() => {
const popupShow = ref(false);
const contactService = () => {
- // #ifdef H5
+ // #ifndef MP-WEIXIN
popupShow.value = true;
// #endif
}
diff --git a/uni-app/src/components/pay/pay.vue b/uni-app/src/components/pay/pay.vue
index 15f4c6986..09d7df06f 100644
--- a/uni-app/src/components/pay/pay.vue
+++ b/uni-app/src/components/pay/pay.vue
@@ -145,6 +145,18 @@ const confirmPay = () => {
location.href = res.data.url
}
// #endif
+ // #ifndef H5
+ uni.requestPayment({
+ provider: 'alipay',
+ ...res.data,
+ success: (res: any) => {
+ toPayResult()
+ },
+ fail: (res: any) => {
+ loading.value = false
+ }
+ })
+ // #endif
break;
default:
if (res.data.url) {
diff --git a/uni-app/src/components/share-popup/share-popup.vue b/uni-app/src/components/share-popup/share-popup.vue
index dd04b5c87..97e596a8a 100644
--- a/uni-app/src/components/share-popup/share-popup.vue
+++ b/uni-app/src/components/share-popup/share-popup.vue
@@ -4,7 +4,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+