diff --git a/uni-app/package-lock.json b/uni-app/package-lock.json
index 574a08b35..6b9408ec1 100644
--- a/uni-app/package-lock.json
+++ b/uni-app/package-lock.json
@@ -45,6 +45,7 @@
"@types/qrcode": "^1.5.0",
"@types/sortablejs": "^1.15.0",
"@vue/tsconfig": "^0.1.3",
+ "cross-env": "^7.0.3",
"sass": "^1.54.5",
"sass-loader": "10.4.1",
"typescript": "^4.9.4",
diff --git a/uni-app/package.json b/uni-app/package.json
index 756dc0f49..0751ad646 100644
--- a/uni-app/package.json
+++ b/uni-app/package.json
@@ -24,7 +24,7 @@
"build:app-android": "uni build -p app-android",
"build:app-ios": "uni build -p app-ios",
"build:custom": "uni build -p",
- "build:h5": "uni build && node publish.cjs h5 build",
+ "build:h5": "cross-env NODE_OPTIONS=--max-old-space-size=4096 && uni build && node publish.cjs h5 build",
"build:h5:ssr": "uni build --ssr",
"build:mp-alipay": "uni build -p mp-alipay",
"build:mp-baidu": "uni build -p mp-baidu",
@@ -33,7 +33,7 @@
"build:mp-lark": "uni build -p mp-lark",
"build:mp-qq": "uni build -p mp-qq",
"build:mp-toutiao": "uni build -p mp-toutiao",
- "build:mp-weixin": "uni build -p mp-weixin && node publish.cjs mp-weixin build",
+ "build:mp-weixin": "cross-env NODE_OPTIONS=--max-old-space-size=4096 && uni build -p mp-weixin && node publish.cjs mp-weixin build",
"build:quickapp-webview": "uni build -p quickapp-webview",
"build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
"build:quickapp-webview-union": "uni build -p quickapp-webview-union",
@@ -83,6 +83,7 @@
"vite": "4.0.4",
"vite-plugin-windicss": "^1.8.10",
"vue-tsc": "^1.0.24",
- "windicss": "^3.5.6"
+ "windicss": "^3.5.6",
+ "cross-env": "^7.0.3"
}
}
diff --git a/uni-app/publish.cjs b/uni-app/publish.cjs
index 7a1fb8e5b..2ec12e7e3 100644
--- a/uni-app/publish.cjs
+++ b/uni-app/publish.cjs
@@ -15,6 +15,7 @@ const main = () => {
if (mode == 'build') {
handleWeappAddonComponents(mode)
handleWeappLanguage(mode)
+ handleProjectConfig(mode)
} else if (mode == 'dev') {
listenWeappRunDev()
}
@@ -96,6 +97,19 @@ const handleWeappLanguage = (mode) => {
}
}
+const handleProjectConfig = (mode) => {
+ const src = `./dist/${mode}/mp-weixin/project.config.json`
+
+ try {
+ let content = fs.readFileSync(src, 'utf8');
+ const config = JSON.parse(content)
+ config.setting.minifyWXML = false
+ fs.writeFileSync(src, JSON.stringify(config))
+ } catch (err) {
+ console.log(err)
+ }
+}
+
const listenWeappRunDev = () => {
const devProcess = spawn('npm', ['run', 'dev:niu-mp-weixin'], {
stdio: ['pipe', 'pipe', 'pipe'],
@@ -112,6 +126,7 @@ const listenWeappRunDev = () => {
serverReady = true;
handleWeappAddonComponents('dev')
handleWeappLanguage('dev')
+ handleProjectConfig('dev')
}
});
diff --git a/uni-app/src/addon/components/diy/group/useDiyGroup.ts b/uni-app/src/addon/components/diy/group/useDiyGroup.ts
index 690719bdb..53f42db19 100644
--- a/uni-app/src/addon/components/diy/group/useDiyGroup.ts
+++ b/uni-app/src/addon/components/diy/group/useDiyGroup.ts
@@ -152,6 +152,7 @@ export function useDiyGroup(params: any = {}) {
})
onHide(() => {
isPagesHide.value = true;
+ diyStore.global.bottomTabBar.isShow = false
})
// 监听滚动事件
diff --git a/uni-app/src/app/api/pay.ts b/uni-app/src/app/api/pay.ts
index 0bf017bbf..eb8ee7acf 100644
--- a/uni-app/src/app/api/pay.ts
+++ b/uni-app/src/app/api/pay.ts
@@ -7,14 +7,6 @@ export function pay(data : AnyObject) {
return request.post(`pay`, data, { showErrorMessage: true })
}
-/**
- * 测试支付
- */
-export function testPay(data : AnyObject) {
- return request.get(`home_service/pay/pay`, data, { showErrorMessage: true })
-}
-
-
/**
* 获取支付信息
*/
diff --git a/uni-app/src/app/pages/index/diy.vue b/uni-app/src/app/pages/index/diy.vue
index e7e174ab5..a3a3792ee 100644
--- a/uni-app/src/app/pages/index/diy.vue
+++ b/uni-app/src/app/pages/index/diy.vue
@@ -19,6 +19,9 @@
+
+
+
@@ -27,9 +30,10 @@ import { ref, nextTick } from 'vue';
import { useDiy } from '@/hooks/useDiy'
import { useShare } from '@/hooks/useShare'
import diyGroup from '@/addon/components/diy/group/index.vue'
+import useDiyStore from '@/app/stores/diy'
const { setShare } = useShare()
-
+const diyStore = useDiyStore()
const diy = useDiy({})
const diyGroupRef = ref(null)
diff --git a/uni-app/src/app/pages/index/index.vue b/uni-app/src/app/pages/index/index.vue
index d0831c98c..ae9b7cd6b 100644
--- a/uni-app/src/app/pages/index/index.vue
+++ b/uni-app/src/app/pages/index/index.vue
@@ -23,6 +23,10 @@
+
+
+
+
@@ -34,9 +38,12 @@ import { useShare } from '@/hooks/useShare'
import diyGroup from '@/addon/components/diy/group/index.vue'
import updateVersion from '@/components/update-version/update-version.vue'
import useSystemStore from '@/stores/system';
+import useDiyStore from '@/app/stores/diy'
const { setShare } = useShare()
+const diyStore = useDiyStore()
+
uni.hideTabBar() // 隐藏tabbar
const diy = useDiy({
diff --git a/uni-app/src/app/pages/member/address_edit.vue b/uni-app/src/app/pages/member/address_edit.vue
index 9d93aa081..ee345fb2e 100644
--- a/uni-app/src/app/pages/member/address_edit.vue
+++ b/uni-app/src/app/pages/member/address_edit.vue
@@ -76,7 +76,7 @@