Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/pages.json

@@ -99,6 +99,27 @@
 				"navigationBarTitleText": "优惠券详情"
 			}
 		}
+		,
+		{
+			"path": "pages/storeEntry/index",
+			"style": {
+				"navigationBarTitleText": "我的店铺"
+			}
+		}
+		,
+		{
+			"path": "pages/storeEntry/detail",
+			"style": {
+				"navigationBarTitleText": "商家入驻"
+			}
+		}
+		,
+		{
+			"path": "pages/order/afterSales",
+			"style": {
+				"navigationBarTitleText": "售后详情"
+			}
+		}
 	],
 	"globalStyle": {
 		"navigationStyle": "custom"

src/pages/order/afterSales.vue

+<template>
+    <view class="container">
+        <Header title="售后"></Header>
+
+        <view class="content">
+            111
+        </view>
+    </view>
+</template>
+
+<script setup>
+import Header from '@/pages/order/components/Header/index.vue';
+
+</script>
+
+<style lang="scss" scoped>
+page {
+    background: #f3f3f3;
+}
+
+.container {
+    width: 375 * 2rpx;
+    margin: 0 auto;
+
+    .content {
+        padding-top: 88rpx;
+    }
+}
+</style>
\ No newline at end of file

src/pages/storeEntry/detail.vue

+<template>
+    <view class="container">
+        <Header title="商家入驻"></Header>
+
+        <view class="content">
+            111111
+        </view>
+    </view>
+</template>
+
+<script setup>
+import Header from '@/pages/order/components/Header/index.vue';
+
+</script>
+
+<style lang="scss" scoped>
+page {
+    background: #f3f3f3;
+}
+
+.container {
+    width: 375 * 2rpx;
+    margin: 0 auto;
+
+    .content {
+        padding-top: 88rpx;
+    }
+}
+</style>
\ No newline at end of file

src/pages/storeEntry/index.vue

+<template>
+    <view class="container">
+        <Header title="我的店铺"></Header>
+
+        <view class="content">
+            111
+        </view>
+    </view>
+</template>
+
+<script setup>
+import Header from '@/pages/order/components/Header/index.vue';
+
+</script>
+
+<style lang="scss" scoped>
+page {
+    background: #f3f3f3;
+}
+
+.container {
+    width: 375 * 2rpx;
+    margin: 0 auto;
+
+    .content {
+        padding-top: 88rpx;
+    }
+}
+</style>
\ No newline at end of file