merge

2022-06-11 11:51:10 +08:00
parent bff7f05255 0b3d73187c
commit bfed17d7d6
5 changed files with 17903 additions and 10549 deletions
--- a/pages/life/life.vue
+++ b/pages/life/life.vue
@@ -82,7 +82,7 @@
 				<view class="other-subtitle">加速共力值增长</view>
 				<image class="other-back" src="../../static/life/icon_08.png"></image>
 			</view>
-			<view class="life-flex-item other" @click="onNav({name: 'Order'}, '')">
+			<view class="life-flex-item other" @click="onNav({name: 'Order',params:{index:0}})">
 				<view class="other-title">
 					<image src="../../static/life/icon_04.png" mode="widthFix"></image>
 					我的订单
--- a/unpackage/dist/dev/app-plus/app-config-service.js
+++ b/unpackage/dist/dev/app-plus/app-config-service.js
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
--- a/unpackage/dist/dev/app-plus/app-view.js
+++ b/unpackage/dist/dev/app-plus/app-view.js
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json