Merge branch 'master' of http://ds.zianxin.com:8418/zianxin/biz-mobile-react

src/manifest.json

@@ -71,8 +71,9 @@
     "vueVersion": "3",
     "h5": {
         "router": {
-            "base": "/H5/",
+            "base": "/",
+//            "base": "/H5/",
             "mode": "hash"
         }
     }
-}
+}

src/pages/boxes/apply-list.vue

@@ -107,6 +107,13 @@ const doCancelApply = async (v: any) => {
                             {{ hooks.useTime(v.createTime, "") }}
                         </text>
                     </view>
+                  <view>
+                    <text class="main-text-28">审批状态：</text>
+                    <tm-tag v-if="v.status == 1" color="info" size="xs">审批中</tm-tag>
+                    <tm-tag v-if="v.status == 2" color="success" size="xs">审批通过</tm-tag>
+                    <tm-tag v-if="v.status == 3" color="error" size="xs">审批不通过</tm-tag>
+                    <tm-tag v-if="v.status == 4" color="info" size="xs">已取消</tm-tag>
+                  </view>
                 </view>
                 <view class="flex-row items-center justify-end p-t-10rpx">
                     <view class="botder_btn" @tap.stop="doCancelApply(v)">取消预约</view>
@@ -116,4 +123,4 @@ const doCancelApply = async (v: any) => {
     </crud-layout>
 </template>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>