fix：更新

.env.development

@@ -1,5 +1,5 @@
 NODE_ENV= development
-# VITE_HTTP_BASE_URL = http://10.39.13.78:8001/api/
+VITE_HTTP_BASE_URL = http://10.39.13.78:8001/api/
-VITE_HTTP_BASE_URL = https://test-weapp-api.linyikj.com.cn/api/
+# VITE_HTTP_BASE_URL = https://test-weapp-api.linyikj.com.cn/api/
 # VITE_HTTP_BASE_URL = https://weapp-api.linyikj.com.cn/api/
 VITE_ACCESS_TOKEN_KEY= 'ACCESS_TOKEN_CUSTOMER'

dist/dev/mp-weixin/INDEX/pay/method.js

@@ -38,11 +38,7 @@ const loadShow = () => {
     if (INDEX_pay_model.useModel.loadingShowNumber.value <= 5) {
       getShow(INDEX_pay_model.useModel.timer.value);
     }
-<<<<<<< HEAD
   }, 1500);
-=======
-  }, 1e3);
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 };
 const method = {
   onPay() {

dist/dev/mp-weixin/INDEX/pay/success.wxml

@@ -1,5 +1 @@
-<<<<<<< HEAD
 <view class="success_page data-v-07d1f403"><view class="data-v-07d1f403"><uni-icons wx:if="{{a}}" class="data-v-07d1f403" u-i="07d1f403-0" bind:__l="__l" u-p="{{a}}"></uni-icons></view><view class="success_label data-v-07d1f403"> 支付成功 </view><view class="success_des data-v-07d1f403"> 您的物业费账单已实时更新 </view><hs-footer wx:if="{{c}}" class="data-v-07d1f403" bindhandleParmaryClick="{{b}}" u-i="07d1f403-1" bind:__l="__l" u-p="{{c}}"/></view>
-=======
-<view class="success_page data-v-07d1f403"><view class="data-v-07d1f403"><uni-icons wx:if="{{a}}" class="data-v-07d1f403" u-i="07d1f403-0" bind:__l="__l" u-p="{{a}}"></uni-icons></view><view class="success_label data-v-07d1f403"> 支付成功 </view><view class="success_des data-v-07d1f403"> 您的订单已实时更新 </view><hs-footer wx:if="{{c}}" class="data-v-07d1f403" bindhandleParmaryClick="{{b}}" u-i="07d1f403-1" bind:__l="__l" u-p="{{c}}"/></view>
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82

dist/dev/mp-weixin/WORKORDER/add/index.js

@@ -40,12 +40,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       WORKORDER_add_model.useModel.formData.value.type = (e == null ? void 0 : e.type) || "";
       WORKORDER_add_model.useModel.formData.value.location = (e == null ? void 0 : e.location) || "";
     });
-<<<<<<< HEAD
     common_vendor.onUnload(() => {
       WORKORDER_add_model.useModel.formData.value = { is_anonymous: false };
     });
-=======
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
     return (_ctx, _cache) => {
       var _a, _b, _c, _d, _e;
       return common_vendor.e({

dist/dev/mp-weixin/WORKORDER/list/index.js

@@ -13,25 +13,14 @@ if (!Array) {
   const _easycom_hs_up_rate2 = common_vendor.resolveComponent("hs-up-rate");
   const _easycom_hs_button2 = common_vendor.resolveComponent("hs-button");
   const _easycom_cc_scroll_loading2 = common_vendor.resolveComponent("cc-scroll-loading");
-<<<<<<< HEAD
+  (_easycom_hs_enum_tag2 + _easycom_hs_up_rate2 + _easycom_hs_button2 + _easycom_cc_scroll_loading2)();
-  (_easycom_hs_tabs2 + _easycom_hs_enum_tag2 + _easycom_cc_scroll_loading2)();
-=======
-  const _easycom_hs_popup_evaluate2 = common_vendor.resolveComponent("hs-popup-evaluate");
-  (_easycom_hs_enum_tag2 + _easycom_hs_up_rate2 + _easycom_hs_button2 + _easycom_cc_scroll_loading2 + _easycom_hs_popup_evaluate2)();
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 }
 const _easycom_hs_enum_tag = () => "../../components/hs-enum-tag/hs-enum-tag.js";
 const _easycom_hs_up_rate = () => "../../components/hs-up-rate/hs-up-rate.js";
 const _easycom_hs_button = () => "../../components/hs-button/hs-button.js";
 const _easycom_cc_scroll_loading = () => "../../common/components/cc-scroll-loading/cc-scroll-loading.js";
-<<<<<<< HEAD
 if (!Math) {
-  (_easycom_hs_tabs + _easycom_hs_enum_tag + _easycom_cc_scroll_loading)();
+  (MyHeader + _easycom_hs_enum_tag + _easycom_hs_up_rate + _easycom_hs_button + _easycom_cc_scroll_loading)();
-=======
-const _easycom_hs_popup_evaluate = () => "../../components/hs-popup-evaluate/hs-popup-evaluate.js";
-if (!Math) {
-  (MyHeader + _easycom_hs_enum_tag + _easycom_hs_up_rate + _easycom_hs_button + _easycom_cc_scroll_loading + _easycom_hs_popup_evaluate)();
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 }
 const MyHeader = () => "./components/header.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
@@ -44,11 +33,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       (_a = WORKORDER_list_method.method) == null ? void 0 : _a.getList();
     });
     return (_ctx, _cache) => {
-<<<<<<< HEAD
+      var _a, _b, _c, _d, _e;
-      var _a, _b, _c, _d, _e, _f, _g, _h;
-=======
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
       return {
         a: common_vendor.f((_b = (_a = common_vendor.unref(WORKORDER_list_model.useModel)) == null ? void 0 : _a.dataList) == null ? void 0 : _b.value, (i, index, i0) => {
           var _a2;
@@ -63,52 +48,41 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
               value: i == null ? void 0 : i.location,
               Enums: common_vendor.unref(gen_Enums.HouseWorkOrdersLocationEnum)
             }),
-            e: "550638e2-4-" + i0 + ",550638e2-1",
+            e: common_vendor.t((_a2 = i == null ? void 0 : i.asset_house) == null ? void 0 : _a2.full_name),
-            f: common_vendor.p({
+            f: common_vendor.t(i == null ? void 0 : i.content),
-              value: i == null ? void 0 : i.status,
+            g: (i == null ? void 0 : i.expect_start_time) && (i == null ? void 0 : i.status) !== "Closed" && (i == null ? void 0 : i.status) !== "Completed"
-              Enums: common_vendor.unref(gen_Enums.HouseWorkOrdersStatusEnum)
-            }),
-<<<<<<< HEAD
-            g: common_vendor.t((_a2 = i == null ? void 0 : i.asset_house) == null ? void 0 : _a2.full_name),
-            h: common_vendor.t(i == null ? void 0 : i.content),
-            i: common_vendor.f(i == null ? void 0 : i.attachments, (k, idx, i1) => {
-              return {
-                a: k == null ? void 0 : k.url,
-                b: `img_${index}_${idx}`
-              };
-            }),
-            j: `items_${index}`,
-            k: common_vendor.o(($event) => {
-=======
-            g: common_vendor.n(`btn_status btn_status_${i == null ? void 0 : i.status}`),
-            h: common_vendor.t((_a2 = i == null ? void 0 : i.asset_house) == null ? void 0 : _a2.full_name),
-            i: common_vendor.t(i == null ? void 0 : i.content),
-            j: (i == null ? void 0 : i.expect_start_time) && (i == null ? void 0 : i.status) !== "Closed" && (i == null ? void 0 : i.status) !== "Completed"
           }, (i == null ? void 0 : i.expect_start_time) && (i == null ? void 0 : i.status) !== "Closed" && (i == null ? void 0 : i.status) !== "Completed" ? {
-            k: common_vendor.t(i == null ? void 0 : i.expect_start_time)
+            h: common_vendor.t(i == null ? void 0 : i.expect_start_time)
           } : {}, {
-            l: (i == null ? void 0 : i.status) === "Completed" && !(i == null ? void 0 : i.accept_time)
+            i: (i == null ? void 0 : i.status) === "Completed" && !(i == null ? void 0 : i.accept_time)
           }, (i == null ? void 0 : i.status) === "Completed" && !(i == null ? void 0 : i.accept_time) ? {
-            m: common_vendor.t(i == null ? void 0 : i.accept_time)
+            j: common_vendor.t(i == null ? void 0 : i.accept_time)
           } : {
-            n: common_vendor.t(i == null ? void 0 : i.created_at)
+            k: common_vendor.t(i == null ? void 0 : i.created_at)
           }, {
-            o: i == null ? void 0 : i.evaluation_score
+            l: i == null ? void 0 : i.evaluation_score
           }, (i == null ? void 0 : i.evaluation_score) ? {
-            p: "550638e2-5-" + i0 + ",550638e2-1",
+            m: "550638e2-4-" + i0 + ",550638e2-1",
-            q: common_vendor.p({
+            n: common_vendor.p({
               valueModel: i == null ? void 0 : i.evaluation_score
             })
           } : {}, {
-            r: common_vendor.o(($event) => {
+            o: (i == null ? void 0 : i.status) !== "Pending" && (i == null ? void 0 : i.status) !== "Closed" && !(i == null ? void 0 : i.evaluation_score)
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
-              var _a3;
-              return (_a3 = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _a3.handleToDetail(i);
-            }, `items_${index}`),
-            s: (i == null ? void 0 : i.status) !== "Pending" && (i == null ? void 0 : i.status) !== "Closed" && !(i == null ? void 0 : i.evaluation_score)
           }, (i == null ? void 0 : i.status) !== "Pending" && (i == null ? void 0 : i.status) !== "Closed" && !(i == null ? void 0 : i.evaluation_score) ? common_vendor.e({
-            t: (i == null ? void 0 : i.status) === "Completed" && !(i == null ? void 0 : i.evaluation_score)
+            p: (i == null ? void 0 : i.status) === "Completed" && !(i == null ? void 0 : i.evaluation_score)
           }, (i == null ? void 0 : i.status) === "Completed" && !(i == null ? void 0 : i.evaluation_score) ? {
+            q: common_vendor.o(($event) => {
+              var _a3;
+              return (_a3 = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _a3.handleAssignEmployee(i);
+            }, `items_${index}`),
+            r: "550638e2-5-" + i0 + ",550638e2-1",
+            s: common_vendor.p({
+              type: "ghost",
+              label: "评价"
+            })
+          } : {}, {
+            t: (i == null ? void 0 : i.status) === "PendingPayment"
+          }, (i == null ? void 0 : i.status) === "PendingPayment" ? {
             v: common_vendor.o(($event) => {
               var _a3;
               return (_a3 = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _a3.handleAssignEmployee(i);
@@ -116,11 +90,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             w: "550638e2-6-" + i0 + ",550638e2-1",
             x: common_vendor.p({
               type: "ghost",
-              label: "评价"
+              label: "支付费用"
             })
           } : {}, {
-            y: (i == null ? void 0 : i.status) === "PendingPayment"
+            y: (i == null ? void 0 : i.status) === "PendingAcceptance"
-          }, (i == null ? void 0 : i.status) === "PendingPayment" ? {
+          }, (i == null ? void 0 : i.status) === "PendingAcceptance" ? {
             z: common_vendor.o(($event) => {
               var _a3;
               return (_a3 = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _a3.handleAssignEmployee(i);
@@ -128,54 +102,27 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             A: "550638e2-7-" + i0 + ",550638e2-1",
             B: common_vendor.p({
               type: "ghost",
-              label: "支付费用"
+              label: "验收工单"
             })
           } : {}, {
-            C: (i == null ? void 0 : i.status) === "PendingAcceptance"
+            C: (i == null ? void 0 : i.status) === "Processing"
-          }, (i == null ? void 0 : i.status) === "PendingAcceptance" ? {
+          }, (i == null ? void 0 : i.status) === "Processing" ? {
             D: common_vendor.o(($event) => {
               var _a3;
               return (_a3 = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _a3.handleAssignEmployee(i);
             }, `items_${index}`),
             E: "550638e2-8-" + i0 + ",550638e2-1",
             F: common_vendor.p({
-              type: "ghost",
-              label: "验收工单"
-            })
-          } : {}, {
-            G: (i == null ? void 0 : i.status) === "Processing"
-          }, (i == null ? void 0 : i.status) === "Processing" ? {
-            H: common_vendor.o(($event) => {
-              var _a3;
-              return (_a3 = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _a3.handleAssignEmployee(i);
-            }, `items_${index}`),
-            I: "550638e2-9-" + i0 + ",550638e2-1",
-            J: common_vendor.p({
               type: "ghost",
               label: "联系处理人"
             })
           } : {}) : {}, {
-            K: `items_${index}`
+            G: `items_${index}`
           });
         }),
-<<<<<<< HEAD
-        d: common_vendor.o((_f = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _f.handleLoad),
-        e: common_vendor.p({
-          meta: (_h = (_g = common_vendor.unref(WORKORDER_list_model.useModel)) == null ? void 0 : _g.meta) == null ? void 0 : _h.value
-=======
         b: common_vendor.o((_c = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _c.handleLoad),
         c: common_vendor.p({
           meta: (_e = (_d = common_vendor.unref(WORKORDER_list_model.useModel)) == null ? void 0 : _d.meta) == null ? void 0 : _e.value
-        }),
-        d: common_vendor.o((_f = common_vendor.unref(WORKORDER_list_method.method)) == null ? void 0 : _f.handlepopupClose),
-        e: common_vendor.o(($event) => common_vendor.unref(WORKORDER_list_model.useModel).showEvaluate.value = false),
-        f: common_vendor.p({
-          show: (_h = (_g = common_vendor.unref(WORKORDER_list_model.useModel)) == null ? void 0 : _g.showEvaluate) == null ? void 0 : _h.value,
-          mode: "bottom",
-          closeable: true,
-          round: 20,
-          params: (_j = (_i = common_vendor.unref(WORKORDER_list_model.useModel)) == null ? void 0 : _i.evaluateParams) == null ? void 0 : _j.value
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
         })
       };
     };

dist/dev/mp-weixin/WORKORDER/list/index.json

@@ -2,14 +2,9 @@
   "navigationBarTitleText": "工单报事",
   "usingComponents": {
     "hs-enum-tag": "../../components/hs-enum-tag/hs-enum-tag",
-<<<<<<< HEAD
-    "cc-scroll-loading": "../../common/components/cc-scroll-loading/cc-scroll-loading"
-=======
     "hs-up-rate": "../../components/hs-up-rate/hs-up-rate",
     "hs-button": "../../components/hs-button/hs-button",
     "cc-scroll-loading": "../../common/components/cc-scroll-loading/cc-scroll-loading",
-    "hs-popup-evaluate": "../../components/hs-popup-evaluate/hs-popup-evaluate",
     "my-header": "./components/header"
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   }
 }

dist/dev/mp-weixin/WORKORDER/list/index.wxml

@@ -1,5 +1 @@
-<<<<<<< HEAD
+<view><my-header u-i="550638e2-0" bind:__l="__l"/><view class="work_contents"><cc-scroll-loading wx:if="{{c}}" u-s="{{['d']}}" bindload="{{b}}" u-i="550638e2-1" bind:__l="__l" u-p="{{c}}"><view wx:for="{{a}}" wx:for-item="i" wx:key="G" class="work_item"><view class="work_item_header"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{i.b}}" u-i="{{i.a}}" bind:__l="__l" u-p="{{i.b}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{i.d}}" u-i="{{i.c}}" bind:__l="__l" u-p="{{i.d}}"/></view></view><view class="work_item_houses">{{i.e}} </view><view class="work_item_des">{{i.f}}</view><view wx:if="{{i.g}}" class="work_item_cell"> 期望处理时间：{{i.h}}(两小时内) </view><view wx:if="{{i.i}}" class="work_item_cell"> 工单完成时间： {{i.j}}</view><view wx:else class="work_item_cell"> 工单创建时间： {{i.k}}</view><view wx:if="{{i.l}}" class="work_item_cell"> 客户评价：<hs-up-rate wx:if="{{i.n}}" u-i="{{i.m}}" bind:__l="__l" u-p="{{i.n}}"/></view></view><view wx:if="{{i.o}}" class="work_item_footer"><hs-button wx:if="{{i.p}}" bindclick="{{i.q}}" u-i="{{i.r}}" bind:__l="__l" u-p="{{i.s}}"/><hs-button wx:if="{{i.t}}" bindclick="{{i.v}}" u-i="{{i.w}}" bind:__l="__l" u-p="{{i.x}}"/><hs-button wx:if="{{i.y}}" bindclick="{{i.z}}" u-i="{{i.A}}" bind:__l="__l" u-p="{{i.B}}"/><hs-button wx:if="{{i.C}}" bindclick="{{i.D}}" u-i="{{i.E}}" bind:__l="__l" u-p="{{i.F}}"/></view></view></cc-scroll-loading></view></view>
-<view><view class="header"><hs-tabs wx:if="{{b}}" bindonChange="{{a}}" u-i="550638e2-0" bind:__l="__l" u-p="{{b}}"/></view><view class="work_contents"><cc-scroll-loading wx:if="{{e}}" u-s="{{['d']}}" bindload="{{d}}" u-i="550638e2-1" bind:__l="__l" u-p="{{e}}"><view wx:for="{{c}}" wx:for-item="i" wx:key="j" class="work_item" bindtap="{{i.k}}"><view class="work_item_header"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{i.b}}" u-i="{{i.a}}" bind:__l="__l" u-p="{{i.b}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{i.d}}" u-i="{{i.c}}" bind:__l="__l" u-p="{{i.d}}"/></view></view><view class="btn_status"><hs-enum-tag wx:if="{{i.f}}" u-i="{{i.e}}" bind:__l="__l" u-p="{{i.f}}"/></view></view><view class="work_item_houses">{{i.g}} </view><view class="work_item_des">{{i.h}}</view><view class="work_item_images"><view wx:for="{{i.i}}" wx:for-item="k" wx:key="b" class="item"><image src="{{k.a}}" mode="aspectFill"/></view></view></view></cc-scroll-loading></view></view>
-=======
-<view><my-header u-i="550638e2-0" bind:__l="__l"/><view class="work_contents"><cc-scroll-loading wx:if="{{c}}" u-s="{{['d']}}" bindload="{{b}}" u-i="550638e2-1" bind:__l="__l" u-p="{{c}}"><view wx:for="{{a}}" wx:for-item="i" wx:key="K" class="work_item"><view bindtap="{{i.r}}"><view class="work_item_header"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{i.b}}" u-i="{{i.a}}" bind:__l="__l" u-p="{{i.b}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{i.d}}" u-i="{{i.c}}" bind:__l="__l" u-p="{{i.d}}"/></view></view><view class="{{i.g}}"><hs-enum-tag wx:if="{{i.f}}" u-i="{{i.e}}" bind:__l="__l" u-p="{{i.f}}"/></view></view><view class="work_item_houses">{{i.h}} </view><view class="work_item_des">{{i.i}}</view><view wx:if="{{i.j}}" class="work_item_cell"> 期望处理时间：{{i.k}}(两小时内) </view><view wx:if="{{i.l}}" class="work_item_cell"> 工单完成时间： {{i.m}}</view><view wx:else class="work_item_cell"> 工单创建时间： {{i.n}}</view><view wx:if="{{i.o}}" class="work_item_cell"> 客户评价：<hs-up-rate wx:if="{{i.q}}" u-i="{{i.p}}" bind:__l="__l" u-p="{{i.q}}"/></view></view><view wx:if="{{i.s}}" class="work_item_footer"><hs-button wx:if="{{i.t}}" bindclick="{{i.v}}" u-i="{{i.w}}" bind:__l="__l" u-p="{{i.x}}"/><hs-button wx:if="{{i.y}}" bindclick="{{i.z}}" u-i="{{i.A}}" bind:__l="__l" u-p="{{i.B}}"/><hs-button wx:if="{{i.C}}" bindclick="{{i.D}}" u-i="{{i.E}}" bind:__l="__l" u-p="{{i.F}}"/><hs-button wx:if="{{i.G}}" bindclick="{{i.H}}" u-i="{{i.I}}" bind:__l="__l" u-p="{{i.J}}"/></view></view></cc-scroll-loading></view><hs-popup-evaluate wx:if="{{f}}" bindonSubmit="{{d}}" bindonClose="{{e}}" u-i="550638e2-10" bind:__l="__l" u-p="{{f}}"/></view>
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82

dist/dev/mp-weixin/WORKORDER/list/index.wxss

@@ -2,11 +2,7 @@ page {
   background-color: #f8f8f8;
 }
 .work_contents {
-<<<<<<< HEAD
   padding: 100rpx 0 0 0;
-=======
-  padding: 220rpx 0 0 0;
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 }
 .work_contents .work_item {
   background-color: #fff;
@@ -32,29 +28,6 @@ page {
   border-radius: 100rpx;
   padding: 7rpx 19rpx;
 }
-<<<<<<< HEAD
-=======
-.work_contents .work_item .work_item_header .btn_status_Pending {
-  color: #f97316;
-  background-color: #fff7ed;
-}
-.work_contents .work_item .work_item_header .btn_status_Processing, .work_contents .work_item .work_item_header .btn_status_PendingAcceptance {
-  color: #0082fa;
-  background-color: #edf4ff;
-}
-.work_contents .work_item .work_item_header .btn_status_PendingPayment {
-  color: #cf1322;
-  background-color: #ffeded;
-}
-.work_contents .work_item .work_item_header .btn_status_Completed {
-  color: #22c55e;
-  background-color: #f0fdf4;
-}
-.work_contents .work_item .work_item_header .btn_status_Closed {
-  color: #909399;
-  background-color: #f3f3f4;
-}
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 .work_contents .work_item .work_item_header .work_item_header_left {
   display: flex;
   align-items: center;

dist/dev/mp-weixin/WORKORDER/show/components/ProcessLogs.js

@@ -1,56 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const gen_Enums = require("../../../gen/Enums.js");
-const WORKORDER_show_model = require("../model.js");
-if (!Array) {
-  const _easycom_hs_empty2 = common_vendor.resolveComponent("hs-empty");
-  const _easycom_hs_enum_tag2 = common_vendor.resolveComponent("hs-enum-tag");
-  const _easycom_up_steps_item2 = common_vendor.resolveComponent("up-steps-item");
-  const _easycom_up_steps2 = common_vendor.resolveComponent("up-steps");
-  (_easycom_hs_empty2 + _easycom_hs_enum_tag2 + _easycom_up_steps_item2 + _easycom_up_steps2)();
-}
-const _easycom_hs_empty = () => "../../../components/hs-empty/hs-empty.js";
-const _easycom_hs_enum_tag = () => "../../../components/hs-enum-tag/hs-enum-tag.js";
-const _easycom_up_steps_item = () => "../../../node-modules/uview-plus/components/u-steps-item/u-steps-item.js";
-const _easycom_up_steps = () => "../../../node-modules/uview-plus/components/u-steps/u-steps.js";
-if (!Math) {
-  (_easycom_hs_empty + _easycom_hs_enum_tag + _easycom_up_steps_item + _easycom_up_steps)();
-}
-const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
-  __name: "ProcessLogs",
-  setup(__props) {
-    return (_ctx, _cache) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-      return common_vendor.e({
-        a: !((_c = (_b = (_a = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _a.logsData) == null ? void 0 : _b.value) == null ? void 0 : _c.length)
-      }, !((_f = (_e = (_d = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _d.logsData) == null ? void 0 : _e.value) == null ? void 0 : _f.length) ? {} : {}, {
-        b: common_vendor.f((_h = (_g = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _g.logsData) == null ? void 0 : _h.value, (i, index, i0) => {
-          return {
-            a: "c8bc8d18-3-" + i0 + "," + ("c8bc8d18-2-" + i0),
-            b: common_vendor.p({
-              value: i == null ? void 0 : i.status,
-              Enums: common_vendor.unref(gen_Enums.HouseWorkOrdersStatusEnum)
-            }),
-            c: common_vendor.t(i == null ? void 0 : i.description),
-            d: common_vendor.f(i == null ? void 0 : i.attachments, (k, index2, i1) => {
-              return {
-                a: k == null ? void 0 : k.url,
-                b: `attachment_${index2}`
-              };
-            }),
-            e: common_vendor.t(i == null ? void 0 : i.created_at),
-            f: `log_item_${index}`,
-            g: "c8bc8d18-2-" + i0 + ",c8bc8d18-1"
-          };
-        }),
-        c: common_vendor.p({
-          direction: "column",
-          dot: true,
-          current: ((_k = (_j = (_i = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _i.logsData) == null ? void 0 : _j.value) == null ? void 0 : _k.length) - 1
-        })
-      });
-    };
-  }
-});
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c8bc8d18"], ["__file", "/Users/zsq/Sources/github/2025property-pay/pay-customer/src/WORKORDER/show/components/ProcessLogs.vue"]]);
-wx.createComponent(Component);

dist/dev/mp-weixin/WORKORDER/show/components/ProcessLogs.json

@@ -1,9 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "hs-empty": "../../../components/hs-empty/hs-empty",
-    "hs-enum-tag": "../../../components/hs-enum-tag/hs-enum-tag",
-    "up-steps-item": "../../../node-modules/uview-plus/components/u-steps-item/u-steps-item",
-    "up-steps": "../../../node-modules/uview-plus/components/u-steps/u-steps"
-  }
-}

dist/dev/mp-weixin/WORKORDER/show/components/ProcessLogs.wxml

@@ -1 +0,0 @@
-<view class="show_card data-v-c8bc8d18"><view class="show_card_title data-v-c8bc8d18"> 处理日志 </view><view class="show_card_content data-v-c8bc8d18"><hs-empty wx:if="{{a}}" class="data-v-c8bc8d18" u-i="c8bc8d18-0" bind:__l="__l"/><up-steps wx:if="{{c}}" class="data-v-c8bc8d18" u-s="{{['d']}}" u-i="c8bc8d18-1" bind:__l="__l" u-p="{{c}}"><up-steps-item wx:for="{{b}}" wx:for-item="i" wx:key="f" class="data-v-c8bc8d18" u-s="{{['desc']}}" u-i="{{i.g}}" bind:__l="__l"><view slot="desc"><view class="desc_title data-v-c8bc8d18"><view class="data-v-c8bc8d18"> 工单进度：<hs-enum-tag wx:if="{{i.b}}" class="data-v-c8bc8d18" u-i="{{i.a}}" bind:__l="__l" u-p="{{i.b}}"/></view></view><view class="desc_content data-v-c8bc8d18">{{i.c}}</view><view class="attachments data-v-c8bc8d18"><view wx:for="{{i.d}}" wx:for-item="k" wx:key="b" class="attachment_item data-v-c8bc8d18"><image class="data-v-c8bc8d18" src="{{k.a}}" mode="heightFix"/></view></view><view class="created_at data-v-c8bc8d18">{{i.e}}</view></view></up-steps-item></up-steps></view></view>

dist/dev/mp-weixin/WORKORDER/show/components/ProcessLogs.wxss

@@ -1,34 +0,0 @@
-.desc_title.data-v-c8bc8d18 {
-  color: #333333;
-  font-size: 28rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.desc_content.data-v-c8bc8d18 {
-  color: #666;
-  font-size: 28rpx;
-  padding: 10rpx 0 0 0;
-}
-.attachments.data-v-c8bc8d18 {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  padding: 20rpx 0 0 0;
-}
-.attachments .attachment_item.data-v-c8bc8d18 {
-  width: 140rpx;
-  height: 140rpx;
-  overflow: hidden;
-  border-radius: 15rpx;
-}
-.attachments image.data-v-c8bc8d18 {
-  width: 140rpx;
-  height: 140rpx;
-  border-radius: 15rpx;
-}
-.created_at.data-v-c8bc8d18 {
-  padding: 10rpx 0 30rpx 0;
-  color: #999;
-  font-size: 24rpx;
-}

dist/dev/mp-weixin/WORKORDER/show/index.js

@@ -3,41 +3,22 @@ const common_vendor = require("../../common/vendor.js");
 const WORKORDER_show_method = require("./method.js");
 const WORKORDER_show_model = require("./model.js");
 const gen_Enums = require("../../gen/Enums.js");
-const common_libraries_day = require("../../common/libraries/day.js");
 require("../../common/libraries/apiLoading.js");
 require("../../gen/Apis.js");
 require("../../common/libraries/request.js");
 require("../../common/store/useWeAppAuthStore.js");
 require("../../common/store/useWorkStore.js");
+require("../../common/libraries/day.js");
 if (!Array) {
   const _easycom_hs_enum_tag2 = common_vendor.resolveComponent("hs-enum-tag");
-<<<<<<< HEAD
   const _easycom_hs_footer2 = common_vendor.resolveComponent("hs-footer");
-  const _easycom_hs_popup_evaluate2 = common_vendor.resolveComponent("hs-popup-evaluate");
+  (_easycom_hs_enum_tag2 + _easycom_hs_footer2)();
-  (_easycom_hs_enum_tag2 + _easycom_hs_footer2 + _easycom_hs_popup_evaluate2)();
 }
 const _easycom_hs_enum_tag = () => "../../components/hs-enum-tag/hs-enum-tag.js";
 const _easycom_hs_footer = () => "../../components/hs-footer/hs-footer.js";
-const _easycom_hs_popup_evaluate = () => "../../components/hs-popup-evaluate/hs-popup-evaluate.js";
 if (!Math) {
-  (_easycom_hs_enum_tag + _easycom_hs_footer + _easycom_hs_popup_evaluate)();
+  (_easycom_hs_enum_tag + _easycom_hs_footer)();
-=======
-  const _easycom_hs_up_rate2 = common_vendor.resolveComponent("hs-up-rate");
-  const _easycom_up_icon2 = common_vendor.resolveComponent("up-icon");
-  const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons");
-  const _easycom_hs_popup_evaluate2 = common_vendor.resolveComponent("hs-popup-evaluate");
-  (_easycom_hs_enum_tag2 + _easycom_hs_up_rate2 + _easycom_up_icon2 + _easycom_uni_icons2 + _easycom_hs_popup_evaluate2)();
 }
-const _easycom_hs_enum_tag = () => "../../components/hs-enum-tag/hs-enum-tag.js";
-const _easycom_hs_up_rate = () => "../../components/hs-up-rate/hs-up-rate.js";
-const _easycom_up_icon = () => "../../node-modules/uview-plus/components/u-icon/u-icon.js";
-const _easycom_uni_icons = () => "../../uni_modules/uni-icons/components/uni-icons/uni-icons.js";
-const _easycom_hs_popup_evaluate = () => "../../components/hs-popup-evaluate/hs-popup-evaluate.js";
-if (!Math) {
-  (_easycom_hs_enum_tag + _easycom_hs_up_rate + MyProcessLogs + _easycom_up_icon + _easycom_uni_icons + _easycom_hs_popup_evaluate)();
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
-}
-const MyProcessLogs = () => "./components/ProcessLogs.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
@@ -57,181 +38,37 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       WORKORDER_show_model.useModel.dataShow.value = void 0;
     });
     return (_ctx, _cache) => {
-<<<<<<< HEAD
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L;
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P;
       return {
-=======
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea, _Fa, _Ga, _Ha, _Ia, _Ja, _Ka, _La, _Ma, _Na, _Oa, _Pa, _Qa, _Ra, _Sa, _Ta, _Ua, _Va, _Wa, _Xa, _Ya, _Za, __a, _$a, _ab, _bb, _cb, _db, _eb, _fb, _gb, _hb, _ib, _jb, _kb, _lb, _mb, _nb, _ob, _pb, _qb, _rb, _sb, _tb, _ub, _vb, _wb, _xb, _yb, _zb, _Ab, _Bb, _Cb, _Db, _Eb, _Fb, _Gb, _Hb, _Ib, _Jb, _Kb;
-      return common_vendor.e({
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
         a: common_vendor.p({
           value: (_c = (_b = (_a = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _a.dataShow) == null ? void 0 : _b.value) == null ? void 0 : _c.type,
           Enums: common_vendor.unref(gen_Enums.HouseWorkOrdersTypeEnum)
         }),
         b: common_vendor.p({
-          value: (_f = (_e = (_d = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _d.dataShow) == null ? void 0 : _e.value) == null ? void 0 : _f.location,
+          value: (_f = (_e = (_d = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _d.dataShow) == null ? void 0 : _e.value) == null ? void 0 : _f.status,
-          Enums: common_vendor.unref(gen_Enums.HouseWorkOrdersLocationEnum)
-        }),
-        c: common_vendor.p({
-          value: (_i = (_h = (_g = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _g.dataShow) == null ? void 0 : _h.value) == null ? void 0 : _i.status,
           Enums: common_vendor.unref(gen_Enums.HouseWorkOrdersStatusEnum)
         }),
-<<<<<<< HEAD
+        c: common_vendor.n(`btn_status btn_status_${(_i = (_h = (_g = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _g.dataShow) == null ? void 0 : _h.value) == null ? void 0 : _i.status}`),
         d: common_vendor.t((_m = (_l = (_k = (_j = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _j.dataShow) == null ? void 0 : _k.value) == null ? void 0 : _l.asset_house) == null ? void 0 : _m.full_name),
         e: common_vendor.t((_p = (_o = (_n = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _n.dataShow) == null ? void 0 : _o.value) == null ? void 0 : _p.title),
         f: common_vendor.t((_s = (_r = (_q = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _q.dataShow) == null ? void 0 : _r.value) == null ? void 0 : _s.content),
         g: common_vendor.f((_v = (_u = (_t = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _t.dataShow) == null ? void 0 : _u.value) == null ? void 0 : _v.attachments, (k, idx, i0) => {
-=======
-        d: common_vendor.n(`btn_status btn_status_${(_l = (_k = (_j = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _j.dataShow) == null ? void 0 : _k.value) == null ? void 0 : _l.status}`),
-        e: common_vendor.t((_p = (_o = (_n = (_m = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _m.dataShow) == null ? void 0 : _n.value) == null ? void 0 : _o.asset_house) == null ? void 0 : _p.full_name),
-        f: common_vendor.t((_s = (_r = (_q = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _q.dataShow) == null ? void 0 : _r.value) == null ? void 0 : _s.title),
-        g: common_vendor.t((_v = (_u = (_t = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _t.dataShow) == null ? void 0 : _u.value) == null ? void 0 : _v.content),
-        h: common_vendor.f((_y = (_x = (_w = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _w.dataShow) == null ? void 0 : _x.value) == null ? void 0 : _y.attachments, (k, idx, i0) => {
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
           return {
             a: k == null ? void 0 : k.url,
             b: `img_${idx}`
           };
         }),
-<<<<<<< HEAD
         h: common_vendor.t((_y = (_x = (_w = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _w.dataShow) == null ? void 0 : _x.value) == null ? void 0 : _y.code),
-        i: common_vendor.t(common_vendor.unref(common_libraries_day.getTimeRangeDisplay)((_B = (_A = (_z = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _z.dataShow) == null ? void 0 : _A.value) == null ? void 0 : _B.expect_start_time, (_E = (_D = (_C = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _C.dataShow) == null ? void 0 : _D.value) == null ? void 0 : _E.expect_end_time)),
+        i: common_vendor.t((_C = (_B = (_A = (_z = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _z.dataShow) == null ? void 0 : _A.value) == null ? void 0 : _B.asset_house) == null ? void 0 : _C.full_name),
-        j: common_vendor.t((_H = (_G = (_F = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _F.dataShow) == null ? void 0 : _G.value) == null ? void 0 : _H.created_at),
+        j: common_vendor.t((_F = (_E = (_D = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _D.dataShow) == null ? void 0 : _E.value) == null ? void 0 : _F.reporter_name),
-        k: common_vendor.o((_I = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _I.handlePhoneCall),
+        k: common_vendor.t((_I = (_H = (_G = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _G.dataShow) == null ? void 0 : _H.value) == null ? void 0 : _I.reporter_phone),
-        l: common_vendor.o((_J = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _J.handleEvaluate),
+        l: common_vendor.t((_L = (_K = (_J = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _J.dataShow) == null ? void 0 : _K.value) == null ? void 0 : _L.created_at),
         m: common_vendor.p({
-          btnOtherShow: ((_M = (_L = (_K = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _K.dataShow) == null ? void 0 : _L.value) == null ? void 0 : _M.status) === "Completed" ? true : false,
+          btnOtherShow: true,
-          btnParimaryName: "联系处理人",
+          btnParimaryName: "联系维修管家",
-          btnOtherName: "工单评价"
+          btnOtherName: "关闭工单"
-        }),
-        n: common_vendor.o((_N = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _N.handlepopupClose),
-        o: common_vendor.o(($event) => common_vendor.unref(WORKORDER_show_model.useModel).showEvaluate.value = false),
-        p: common_vendor.p({
-          show: (_P = (_O = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _O.showEvaluate) == null ? void 0 : _P.value,
-          mode: "bottom",
-          closeable: true,
-          round: 20
-=======
-        i: common_vendor.t((_B = (_A = (_z = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _z.dataShow) == null ? void 0 : _A.value) == null ? void 0 : _B.code),
-        j: common_vendor.t(common_vendor.unref(common_libraries_day.getTimeRangeDisplay)((_E = (_D = (_C = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _C.dataShow) == null ? void 0 : _D.value) == null ? void 0 : _E.expect_start_time, (_H = (_G = (_F = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _F.dataShow) == null ? void 0 : _G.value) == null ? void 0 : _H.expect_end_time)),
-        k: common_vendor.t((_K = (_J = (_I = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _I.dataShow) == null ? void 0 : _J.value) == null ? void 0 : _K.created_at),
-        l: (_N = (_M = (_L = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _L.dataShow) == null ? void 0 : _M.value) == null ? void 0 : _N.evaluation_score
-      }, ((_Q = (_P = (_O = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _O.dataShow) == null ? void 0 : _P.value) == null ? void 0 : _Q.evaluation_score) ? {
-        m: common_vendor.p({
-          valueModel: (_T = (_S = (_R = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _R.dataShow) == null ? void 0 : _S.value) == null ? void 0 : _T.evaluation_score
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
         })
-      } : {}, {
+      };
-        n: ((_W = (_V = (_U = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _U.dataShow) == null ? void 0 : _V.value) == null ? void 0 : _W.status) !== "Closed"
-      }, ((_Z = (_Y = (_X = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _X.dataShow) == null ? void 0 : _Y.value) == null ? void 0 : _Z.status) !== "Closed" ? common_vendor.e({
-        o: ((_aa = (_$ = (__ = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : __.dataShow) == null ? void 0 : _$.value) == null ? void 0 : _aa.status) === "Pending"
-      }, ((_da = (_ca = (_ba = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _ba.dataShow) == null ? void 0 : _ca.value) == null ? void 0 : _da.status) === "Pending" ? {
-        p: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.handleClosed) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.handleClosed(...args));
-          }
-        )
-      } : {}, {
-        q: ((_ga = (_fa = (_ea = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _ea.dataShow) == null ? void 0 : _fa.value) == null ? void 0 : _ga.status) === "Processing"
-      }, ((_ja = (_ia = (_ha = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _ha.dataShow) == null ? void 0 : _ia.value) == null ? void 0 : _ja.status) === "Processing" ? {
-        r: common_vendor.p({
-          name: "file-text",
-          size: "28"
-        }),
-        s: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.handleClosed) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.handleClosed(...args));
-          }
-        )
-      } : {}, {
-        t: ((_ma = (_la = (_ka = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _ka.dataShow) == null ? void 0 : _la.value) == null ? void 0 : _ma.status) === "Completed" && !((_pa = (_oa = (_na = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _na.dataShow) == null ? void 0 : _oa.value) == null ? void 0 : _pa.evaluation_score)
-      }, ((_sa = (_ra = (_qa = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _qa.dataShow) == null ? void 0 : _ra.value) == null ? void 0 : _sa.status) === "Completed" && !((_va = (_ua = (_ta = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _ta.dataShow) == null ? void 0 : _ua.value) == null ? void 0 : _va.evaluation_score) ? {
-        v: common_vendor.p({
-          type: "undo-filled",
-          color: "#333",
-          size: "26"
-        }),
-        w: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.handleRework) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.handleRework(...args));
-          }
-        )
-      } : {}, {
-        x: ((_ya = (_xa = (_wa = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _wa.dataShow) == null ? void 0 : _xa.value) == null ? void 0 : _ya.status) === "Completed" && ((_Ba = (_Aa = (_za = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _za.dataShow) == null ? void 0 : _Aa.value) == null ? void 0 : _Ba.evaluation_score)
-      }, ((_Ea = (_Da = (_Ca = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Ca.dataShow) == null ? void 0 : _Da.value) == null ? void 0 : _Ea.status) === "Completed" && ((_Ha = (_Ga = (_Fa = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Fa.dataShow) == null ? void 0 : _Ga.value) == null ? void 0 : _Ha.evaluation_score) ? {
-        y: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.handleRework) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.handleRework(...args));
-          }
-        )
-      } : {}, {
-        z: ((_Ka = (_Ja = (_Ia = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Ia.dataShow) == null ? void 0 : _Ja.value) == null ? void 0 : _Ka.status) === "Pending" || ((_Na = (_Ma = (_La = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _La.dataShow) == null ? void 0 : _Ma.value) == null ? void 0 : _Na.status) === "Processing"
-      }, ((_Qa = (_Pa = (_Oa = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Oa.dataShow) == null ? void 0 : _Pa.value) == null ? void 0 : _Qa.status) === "Pending" || ((_Ta = (_Sa = (_Ra = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Ra.dataShow) == null ? void 0 : _Sa.value) == null ? void 0 : _Ta.status) === "Processing" ? {
-        A: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.hadnleUpdateTime) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.hadnleUpdateTime(...args));
-          }
-        )
-      } : {}, {
-        B: ((_Wa = (_Va = (_Ua = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Ua.dataShow) == null ? void 0 : _Va.value) == null ? void 0 : _Wa.status) === "PendingAcceptance"
-      }, ((_Za = (_Ya = (_Xa = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Xa.dataShow) == null ? void 0 : _Ya.value) == null ? void 0 : _Za.status) === "PendingAcceptance" ? {
-        C: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.handlePhoneCall) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.handlePhoneCall(...args));
-          }
-        )
-      } : {}, {
-        D: ((_ab = (_$a = (__a = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : __a.dataShow) == null ? void 0 : _$a.value) == null ? void 0 : _ab.status) !== "Pending" && ((_db = (_cb = (_bb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _bb.dataShow) == null ? void 0 : _cb.value) == null ? void 0 : _db.status) !== "Completed" && ((_gb = (_fb = (_eb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _eb.dataShow) == null ? void 0 : _fb.value) == null ? void 0 : _gb.status) !== "Closed"
-      }, ((_jb = (_ib = (_hb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _hb.dataShow) == null ? void 0 : _ib.value) == null ? void 0 : _jb.status) !== "Pending" && ((_mb = (_lb = (_kb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _kb.dataShow) == null ? void 0 : _lb.value) == null ? void 0 : _mb.status) !== "Completed" && ((_pb = (_ob = (_nb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _nb.dataShow) == null ? void 0 : _ob.value) == null ? void 0 : _pb.status) !== "Closed" ? {
-        E: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.handlePhoneCall) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.handlePhoneCall(...args));
-          }
-        )
-      } : {}, {
-        F: ((_sb = (_rb = (_qb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _qb.dataShow) == null ? void 0 : _rb.value) == null ? void 0 : _sb.status) === "PendingPayment"
-      }, ((_vb = (_ub = (_tb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _tb.dataShow) == null ? void 0 : _ub.value) == null ? void 0 : _vb.status) === "PendingPayment" ? {
-        G: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.handlePhoneCall) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.handlePhoneCall(...args));
-          }
-        )
-      } : {}, {
-        H: ((_yb = (_xb = (_wb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _wb.dataShow) == null ? void 0 : _xb.value) == null ? void 0 : _yb.status) === "Completed" && !((_Bb = (_Ab = (_zb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _zb.dataShow) == null ? void 0 : _Ab.value) == null ? void 0 : _Bb.evaluation_score)
-      }, ((_Eb = (_Db = (_Cb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Cb.dataShow) == null ? void 0 : _Db.value) == null ? void 0 : _Eb.status) === "Completed" && !((_Hb = (_Gb = (_Fb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Fb.dataShow) == null ? void 0 : _Gb.value) == null ? void 0 : _Hb.evaluation_score) ? {
-        I: common_vendor.o(
-          //@ts-ignore
-          (...args) => {
-            var _a2, _b2;
-            return ((_a2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _a2.handlePhoneCall) && ((_b2 = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _b2.handlePhoneCall(...args));
-          }
-        )
-      } : {}) : {}, {
-        J: common_vendor.o((_Ib = common_vendor.unref(WORKORDER_show_method.method)) == null ? void 0 : _Ib.handlepopupClose),
-        K: common_vendor.o(($event) => common_vendor.unref(WORKORDER_show_model.useModel).showEvaluate.value = false),
-        L: common_vendor.p({
-          show: (_Kb = (_Jb = common_vendor.unref(WORKORDER_show_model.useModel)) == null ? void 0 : _Jb.showEvaluate) == null ? void 0 : _Kb.value,
-          mode: "bottom",
-          closeable: true,
-          round: 20
-        })
-      });
     };
   }
 });

dist/dev/mp-weixin/WORKORDER/show/index.json

@@ -2,15 +2,6 @@
   "navigationBarTitleText": "工单详情",
   "usingComponents": {
     "hs-enum-tag": "../../components/hs-enum-tag/hs-enum-tag",
-<<<<<<< HEAD
+    "hs-footer": "../../components/hs-footer/hs-footer"
-    "hs-footer": "../../components/hs-footer/hs-footer",
-    "hs-popup-evaluate": "../../components/hs-popup-evaluate/hs-popup-evaluate"
-=======
-    "hs-up-rate": "../../components/hs-up-rate/hs-up-rate",
-    "up-icon": "../../node-modules/uview-plus/components/u-icon/u-icon",
-    "uni-icons": "../../uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "hs-popup-evaluate": "../../components/hs-popup-evaluate/hs-popup-evaluate",
-    "my-process-logs": "./components/ProcessLogs"
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   }
 }

dist/dev/mp-weixin/WORKORDER/show/index.wxml

@@ -1,5 +1 @@
-<<<<<<< HEAD
+<view class="work_page"><view class="show_card"><view class="card_header_type_status"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{a}}" u-i="337b3881-0" bind:__l="__l" u-p="{{a}}"/></view><view class="btn_type"></view></view><view class="{{c}}"><hs-enum-tag wx:if="{{b}}" u-i="337b3881-1" bind:__l="__l" u-p="{{b}}"/></view></view><view class="card_header_huse_info"><text>{{d}}</text><text>{{e}}</text></view><view class="card_header_content_info">{{f}}</view><view class="card_header_imgs"><view wx:for="{{g}}" wx:for-item="k" wx:key="b" class="item"><image src="{{k.a}}" mode="aspectFill"/></view></view></view><view class="show_card"><view class="work_item_cell"> 工单编号 <text>{{h}}</text></view><view class="work_item_cell"> 房屋信息 <text>{{i}}</text></view><view class="work_item_cell"> 报修人 <text>{{j}}</text></view><view class="work_item_cell"> 联系电话 <text>{{k}}</text></view><view class="work_item_cell"> 提报时间 <text>{{l}}</text></view></view><hs-footer wx:if="{{m}}" u-i="337b3881-2" bind:__l="__l" u-p="{{m}}"/></view>
-<view><view class="show_card"><view class="card_header_type_status"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{a}}" u-i="337b3881-0" bind:__l="__l" u-p="{{a}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{b}}" u-i="337b3881-1" bind:__l="__l" u-p="{{b}}"/></view></view><view class="btn_status"><hs-enum-tag wx:if="{{c}}" u-i="337b3881-2" bind:__l="__l" u-p="{{c}}"/></view></view><view class="card_header_huse_info"><text>{{d}}</text><text>{{e}}</text></view><view class="card_header_content_info">{{f}}</view><view class="card_header_imgs"><view wx:for="{{g}}" wx:for-item="k" wx:key="b" class="item"><image src="{{k.a}}" mode="aspectFill"/></view></view><view class="show_card_footer"><view class="work_item_cell"> 工单编号 <text>{{h}}</text></view><view class="work_item_cell"> 期望上门时间 <text>{{i}}</text></view><view class="work_item_cell"> 提报时间 <text>{{j}}</text></view></view></view><hs-footer wx:if="{{m}}" bindhandleParmaryClick="{{k}}" bindhandleOtherClick="{{l}}" u-i="337b3881-3" bind:__l="__l" u-p="{{m}}"/><hs-popup-evaluate wx:if="{{p}}" bindonSubmit="{{n}}" bindonClose="{{o}}" u-i="337b3881-4" bind:__l="__l" u-p="{{p}}"/></view>
-=======
-<view class="work_page"><view class="show_card"><view class="card_header_type_status"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{a}}" u-i="337b3881-0" bind:__l="__l" u-p="{{a}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{b}}" u-i="337b3881-1" bind:__l="__l" u-p="{{b}}"/></view></view><view class="{{d}}"><hs-enum-tag wx:if="{{c}}" u-i="337b3881-2" bind:__l="__l" u-p="{{c}}"/></view></view><view class="card_header_huse_info"><text>{{e}}</text><text>{{f}}</text></view><view class="card_header_content_info">{{g}}</view><view class="card_header_imgs"><view wx:for="{{h}}" wx:for-item="k" wx:key="b" class="item"><image src="{{k.a}}" mode="aspectFill"/></view></view><view class="show_card_footer"><view class="work_item_cell"> 工单编号： <text>{{i}}</text></view><view class="work_item_cell"> 期望上门处理时间： <text>{{j}}</text></view><view class="work_item_cell"> 提报时间：<text>{{k}}</text></view><view wx:if="{{l}}" class="work_item_cell"> 客户评价：<hs-up-rate wx:if="{{m}}" u-i="337b3881-3" bind:__l="__l" u-p="{{m}}"/></view></view></view><my-process-logs u-i="337b3881-4" bind:__l="__l"/><view wx:if="{{n}}" class="work_order_footer"><view wx:if="{{o}}" class="btn" bindtap="{{p}}"> 关闭工单 </view><view wx:if="{{q}}" class="btn_close" bindtap="{{s}}"><view class="icon_close"><up-icon wx:if="{{r}}" u-i="337b3881-5" bind:__l="__l" u-p="{{r}}"></up-icon></view><view> 关闭工单 </view></view><view wx:if="{{t}}" class="btn_close" bindtap="{{w}}"><view class="icon_close"><uni-icons wx:if="{{v}}" u-i="337b3881-6" bind:__l="__l" u-p="{{v}}"></uni-icons></view><view> 工单返工 </view></view><view wx:if="{{x}}" class="btn handle_rework_btn" bindtap="{{y}}"> 工单返工 </view><view wx:if="{{z}}" class="btn" bindtap="{{A}}"> 修改处理时间 </view><view wx:if="{{B}}" class="btn" bindtap="{{C}}"> 验收工单 </view><view wx:if="{{D}}" class="btn" bindtap="{{E}}"> 联系处理人 </view><view wx:if="{{F}}" class="btn" bindtap="{{G}}"> 支付费用 </view><view wx:if="{{H}}" class="btn" bindtap="{{I}}"> 工单评价 </view></view><hs-popup-evaluate wx:if="{{L}}" bindonSubmit="{{J}}" bindonClose="{{K}}" u-i="337b3881-7" bind:__l="__l" u-p="{{L}}"/></view>
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82

dist/dev/mp-weixin/WORKORDER/show/index.wxss

@@ -28,29 +28,6 @@ page {
   font-size: 28rpx;
   padding: 7rpx 19rpx;
 }
-<<<<<<< HEAD
-=======
-.show_card .card_header_type_status .btn_status_Pending {
-  color: #f97316;
-  background-color: #fff7ed;
-}
-.show_card .card_header_type_status .btn_status_Processing, .show_card .card_header_type_status .btn_status_PendingAcceptance {
-  color: #0082fa;
-  background-color: #edf4ff;
-}
-.show_card .card_header_type_status .btn_status_PendingPayment {
-  color: #cf1322;
-  background-color: #ffeded;
-}
-.show_card .card_header_type_status .btn_status_Completed {
-  color: #22c55e;
-  background-color: #f0fdf4;
-}
-.show_card .card_header_type_status .btn_status_Closed {
-  color: #909399;
-  background-color: #f3f3f4;
-}
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 .show_card .card_header_type_status .work_item_header_left {
   display: flex;
   align-items: center;
@@ -109,11 +86,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-<<<<<<< HEAD
   font-size: 30rpx;
-=======
-  font-size: 28rpx;
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   color: #333;
   padding-top: 25rpx;
 }
@@ -122,62 +95,4 @@ page {
 }
 .work_item_cell text {
   font-size: 27rpx;
-<<<<<<< HEAD
-=======
-}
-.show_card_title {
-  font-size: 28rpx;
-  padding: 30rpx 0;
-  font-weight: 500;
-}
-.work_order_footer {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  box-shadow: 0px -3px 7px rgba(206, 206, 206, 0.25);
-  padding: 30rpx 30rpx 0 30rpx;
-  z-index: 100;
-  background-color: #fff;
-  padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
-  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.work_order_footer .btn {
-  padding: 20rpx 0;
-  flex: 1;
-  border-radius: 100rpx;
-  text-align: center;
-  background-color: #0082fa;
-  color: #fff;
-  font-size: 28rpx;
-  margin-right: 30rpx;
-}
-.work_order_footer .btn:first-child, .work_order_footer .btn:nth-child(2) {
-  background-color: #f3f3f4;
-  color: #333333;
-  margin-right: 30rpx;
-}
-.work_order_footer .btn:last-child {
-  margin-right: 0;
-  background-color: #0082fa;
-  color: #fff;
-}
-.work_order_footer .handle_rework_btn {
-  background-color: #f3f3f4 !important;
-  color: #333 !important;
-}
-.work_order_footer .btn_close {
-  text-align: center;
-  font-size: 20rpx;
-  padding-right: 30rpx;
-  color: #3d3d3d;
-}
-.work_order_footer .btn_close .icon_close {
-  display: flex;
-  align-items: center;
-  justify-content: center;
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 }

dist/dev/mp-weixin/WORKORDER/show/method.js

@@ -11,7 +11,6 @@ const getShow = (id) => {
 };
 const getHouseWorkLogs = (id) => {
   common_libraries_apiLoading.getApiLoading(gen_Apis.Apis.WorkOrder.HouseWorkLogs.List, { house_work_orders_id: id }).then((res) => {
-    WORKORDER_show_model.useModel.logsData.value = res == null ? void 0 : res.data;
   });
 };
 const method = {
@@ -124,30 +123,31 @@ const method = {
     common_vendor.index.navigateTo({
       url: `/WORKORDER/update_work_rework/index?id=${(_c = (_b = (_a = WORKORDER_show_model.useModel) == null ? void 0 : _a.dataShow) == null ? void 0 : _b.value) == null ? void 0 : _c.id}`
     });
-  },
-  handleEvaluate() {
-    WORKORDER_show_model.useModel.showEvaluate.value = true;
-  },
-  handlepopupClose() {
-    WORKORDER_show_model.useModel.showEvaluate.value = false;
-    common_vendor.index.showToast({
-      title: "评价已提交",
-      icon: "none"
-    });
-  },
-  handlePhoneCall() {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    if ((_d = (_c = (_b = (_a = WORKORDER_show_model.useModel) == null ? void 0 : _a.dataShow) == null ? void 0 : _b.value) == null ? void 0 : _c.assign_employee) == null ? void 0 : _d.phone) {
-      common_vendor.index.makePhoneCall({
-        phoneNumber: (_h = (_g = (_f = (_e = WORKORDER_show_model.useModel) == null ? void 0 : _e.dataShow) == null ? void 0 : _f.value) == null ? void 0 : _g.assign_employee) == null ? void 0 : _h.phone
-        //仅为示例，并非真实的电话号码
-      });
-    } else {
-      common_vendor.index.showToast({
-        title: "暂无电话号码",
-        icon: "none"
-      });
-    }
   }
+  // handleEvaluate() {
+  //   // uni.navigateTo({
+  //   //   url: '/ME/user_evaluate/index'
+  //   // })
+  //   useModel.showEvaluate.value = true
+  // },
+  // handlepopupClose() {
+  //   useModel.showEvaluate.value = false
+  //   uni.showToast({
+  //     title: '评价已提交',
+  //     icon: 'none'
+  //   })
+  // },
+  // handlePhoneCall() {
+  //   if (useModel?.dataShow?.value?.assign_employee?.phone) {
+  //     uni.makePhoneCall({
+  //       phoneNumber: useModel?.dataShow?.value?.assign_employee?.phone //仅为示例，并非真实的电话号码
+  //     })
+  //   } else {
+  //     uni.showToast({
+  //       title: '暂无电话号码',
+  //       icon: 'none'
+  //     })
+  //   }
+  // }
 };
 exports.method = method;

dist/dev/mp-weixin/WORKORDER/show/model.js

@@ -2,10 +2,6 @@
 const common_vendor = require("../../common/vendor.js");
 const useModel = {
   dataShow: common_vendor.ref({}),
-<<<<<<< HEAD
-=======
-  logsData: common_vendor.ref([]),
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   showEvaluate: common_vendor.ref(false)
 };
 exports.useModel = useModel;

dist/dev/mp-weixin/app.js

@@ -18,13 +18,10 @@ if (!Math) {
   "./WORKORDER/list/index.js";
   "./WORKORDER/add/index.js";
   "./WORKORDER/show/index.js";
-<<<<<<< HEAD
-=======
   "./WORKORDER/acceptance/index.js";
   "./WORKORDER/pay/index.js";
   "./WORKORDER/update_work_time/index.js";
   "./WORKORDER/update_work_rework/index.js";
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   "./ME/feedback/index.js";
   "./ME/activities_show/index.js";
   "./ME/activities_list/index.js";

dist/dev/mp-weixin/app.json

@@ -44,29 +44,6 @@
         "work_order_home/index"
       ]
     },
-    {
-      "root": "ME",
-      "pages": [
-        "feedback/index",
-        "activities_show/index",
-        "activities_list/index",
-        "wallet/index",
-        "recharge/index",
-        "recharge_record/index",
-        "advance_payment_house/index",
-        "me_invoice/list/index",
-        "me_invoice/add/index",
-        "vehicle_management/list/index",
-        "vehicle_management/add/index",
-        "issue_invoice/index",
-        "payment_pre_stored/index",
-        "pre_stored_form/index",
-        "user_evaluate/index",
-        "income_expenditure/index",
-        "parking_fee/index",
-        "work_order_home/index"
-      ]
-    },
     {
       "root": "INDEX",
       "pages": [

dist/dev/mp-weixin/common/libraries/day.js

@@ -48,30 +48,6 @@ function generateTimeSlots(externalDate = null) {
   console.log("slots", slots);
   return slots;
 }
-function getTimeRangeDisplay(startTime, endTime, currentTime = null) {
-  try {
-    const start = common_vendor.dayjs(startTime);
-    const end = common_vendor.dayjs(endTime);
-    const now = currentTime ? common_vendor.dayjs(currentTime) : common_vendor.dayjs();
-    if (!start.isValid() || !end.isValid()) {
-      return "时间格式错误";
-    }
-    if (start.isAfter(end)) {
-      return "时间顺序错误";
-    }
-    if (now.isAfter(start) && now.isBefore(end)) {
-      return "两个小时内";
-    }
-    const isSameDay2 = start.isSame(end, "day");
-    if (isSameDay2) {
-      return `${start.format("YYYY-MM-DD")} ${start.format("HH:mm")}-${end.format("HH:mm")}`;
-    } else {
-      return `${start.format("YYYY-MM-DD HH:mm")} - ${end.format("YYYY-MM-DD HH:mm")}`;
-    }
-  } catch (error) {
-    return "时间格式错误";
-  }
-}
 function getFromNow(time) {
   return time ? common_vendor.dayjs(time).fromNow() : "";
 }
@@ -84,8 +60,6 @@ function getIsInRangeInclusive(start, end) {
 function getDate(time) {
   return time ? common_vendor.dayjs(time).format("YYYY-MM-DD") : "";
 }
-<<<<<<< HEAD
-=======
 function specificTime(targetTime) {
   const now = common_vendor.dayjs();
   const target = common_vendor.dayjs(targetTime);
@@ -93,16 +67,11 @@ function specificTime(targetTime) {
   console.log(hoursDiff, "hoursDiff");
   return hoursDiff;
 }
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 exports.generateTimeSlots = generateTimeSlots;
 exports.getCurrentHour = getCurrentHour;
 exports.getDate = getDate;
 exports.getFromNow = getFromNow;
 exports.getIsInRangeInclusive = getIsInRangeInclusive;
 exports.getTheFutureDay = getTheFutureDay;
-exports.getTimeRangeDisplay = getTimeRangeDisplay;
 exports.showDay = showDay;
-<<<<<<< HEAD
-=======
 exports.specificTime = specificTime;
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82

dist/dev/mp-weixin/common/libraries/request.js

@@ -3,11 +3,7 @@ const common_vendor = require("../vendor.js");
 const common_store_useWeAppAuthStore = require("../store/useWeAppAuthStore.js");
 const http = new common_vendor.Request();
 http.setConfig((config) => {
-<<<<<<< HEAD
-  config.baseURL = "https://test-weapp-api.linyikj.com.cn/api/";
-=======
   config.baseURL = "http://10.39.13.78:8001/api/";
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   config.header = {
     ...config.header
   };

dist/dev/mp-weixin/common/vendor.js

@@ -11679,318 +11679,6 @@ class Request2 {
   }
 }
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-<<<<<<< HEAD
-function getDefaultExportFromCjs(x) {
-  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
-}
-var dayjs_minExports$1 = {};
-var dayjs_min = {
-  get exports() {
-    return dayjs_minExports$1;
-  },
-  set exports(v) {
-    dayjs_minExports$1 = v;
-  }
-};
-var hasRequiredDayjs_min;
-function requireDayjs_min() {
-  if (hasRequiredDayjs_min)
-    return dayjs_minExports$1;
-  hasRequiredDayjs_min = 1;
-  (function(module2, exports2) {
-    !function(t2, e2) {
-      module2.exports = e2();
-    }(commonjsGlobal, function() {
-      var t2 = 1e3, e2 = 6e4, n2 = 36e5, r2 = "millisecond", i = "second", s2 = "minute", u = "hour", a = "day", o2 = "week", c = "month", f2 = "quarter", h = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t3) {
-        var e3 = ["th", "st", "nd", "rd"], n3 = t3 % 100;
-        return "[" + t3 + (e3[(n3 - 20) % 10] || e3[n3] || e3[0]) + "]";
-      } }, m = function(t3, e3, n3) {
-        var r3 = String(t3);
-        return !r3 || r3.length >= e3 ? t3 : "" + Array(e3 + 1 - r3.length).join(n3) + t3;
-      }, v = { s: m, z: function(t3) {
-        var e3 = -t3.utcOffset(), n3 = Math.abs(e3), r3 = Math.floor(n3 / 60), i2 = n3 % 60;
-        return (e3 <= 0 ? "+" : "-") + m(r3, 2, "0") + ":" + m(i2, 2, "0");
-      }, m: function t3(e3, n3) {
-        if (e3.date() < n3.date())
-          return -t3(n3, e3);
-        var r3 = 12 * (n3.year() - e3.year()) + (n3.month() - e3.month()), i2 = e3.clone().add(r3, c), s3 = n3 - i2 < 0, u2 = e3.clone().add(r3 + (s3 ? -1 : 1), c);
-        return +(-(r3 + (n3 - i2) / (s3 ? i2 - u2 : u2 - i2)) || 0);
-      }, a: function(t3) {
-        return t3 < 0 ? Math.ceil(t3) || 0 : Math.floor(t3);
-      }, p: function(t3) {
-        return { M: c, y: h, w: o2, d: a, D: d, h: u, m: s2, s: i, ms: r2, Q: f2 }[t3] || String(t3 || "").toLowerCase().replace(/s$/, "");
-      }, u: function(t3) {
-        return void 0 === t3;
-      } }, g = "en", D = {};
-      D[g] = M;
-      var p2 = "$isDayjsObject", S = function(t3) {
-        return t3 instanceof _ || !(!t3 || !t3[p2]);
-      }, w = function t3(e3, n3, r3) {
-        var i2;
-        if (!e3)
-          return g;
-        if ("string" == typeof e3) {
-          var s3 = e3.toLowerCase();
-          D[s3] && (i2 = s3), n3 && (D[s3] = n3, i2 = s3);
-          var u2 = e3.split("-");
-          if (!i2 && u2.length > 1)
-            return t3(u2[0]);
-        } else {
-          var a2 = e3.name;
-          D[a2] = e3, i2 = a2;
-        }
-        return !r3 && i2 && (g = i2), i2 || !r3 && g;
-      }, O = function(t3, e3) {
-        if (S(t3))
-          return t3.clone();
-        var n3 = "object" == typeof e3 ? e3 : {};
-        return n3.date = t3, n3.args = arguments, new _(n3);
-      }, b = v;
-      b.l = w, b.i = S, b.w = function(t3, e3) {
-        return O(t3, { locale: e3.$L, utc: e3.$u, x: e3.$x, $offset: e3.$offset });
-      };
-      var _ = function() {
-        function M2(t3) {
-          this.$L = w(t3.locale, null, true), this.parse(t3), this.$x = this.$x || t3.x || {}, this[p2] = true;
-        }
-        var m2 = M2.prototype;
-        return m2.parse = function(t3) {
-          this.$d = function(t4) {
-            var e3 = t4.date, n3 = t4.utc;
-            if (null === e3)
-              return new Date(NaN);
-            if (b.u(e3))
-              return new Date();
-            if (e3 instanceof Date)
-              return new Date(e3);
-            if ("string" == typeof e3 && !/Z$/i.test(e3)) {
-              var r3 = e3.match($);
-              if (r3) {
-                var i2 = r3[2] - 1 || 0, s3 = (r3[7] || "0").substring(0, 3);
-                return n3 ? new Date(Date.UTC(r3[1], i2, r3[3] || 1, r3[4] || 0, r3[5] || 0, r3[6] || 0, s3)) : new Date(r3[1], i2, r3[3] || 1, r3[4] || 0, r3[5] || 0, r3[6] || 0, s3);
-              }
-            }
-            return new Date(e3);
-          }(t3), this.init();
-        }, m2.init = function() {
-          var t3 = this.$d;
-          this.$y = t3.getFullYear(), this.$M = t3.getMonth(), this.$D = t3.getDate(), this.$W = t3.getDay(), this.$H = t3.getHours(), this.$m = t3.getMinutes(), this.$s = t3.getSeconds(), this.$ms = t3.getMilliseconds();
-        }, m2.$utils = function() {
-          return b;
-        }, m2.isValid = function() {
-          return !(this.$d.toString() === l);
-        }, m2.isSame = function(t3, e3) {
-          var n3 = O(t3);
-          return this.startOf(e3) <= n3 && n3 <= this.endOf(e3);
-        }, m2.isAfter = function(t3, e3) {
-          return O(t3) < this.startOf(e3);
-        }, m2.isBefore = function(t3, e3) {
-          return this.endOf(e3) < O(t3);
-        }, m2.$g = function(t3, e3, n3) {
-          return b.u(t3) ? this[e3] : this.set(n3, t3);
-        }, m2.unix = function() {
-          return Math.floor(this.valueOf() / 1e3);
-        }, m2.valueOf = function() {
-          return this.$d.getTime();
-        }, m2.startOf = function(t3, e3) {
-          var n3 = this, r3 = !!b.u(e3) || e3, f3 = b.p(t3), l2 = function(t4, e4) {
-            var i2 = b.w(n3.$u ? Date.UTC(n3.$y, e4, t4) : new Date(n3.$y, e4, t4), n3);
-            return r3 ? i2 : i2.endOf(a);
-          }, $2 = function(t4, e4) {
-            return b.w(n3.toDate()[t4].apply(n3.toDate("s"), (r3 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e4)), n3);
-          }, y2 = this.$W, M3 = this.$M, m3 = this.$D, v2 = "set" + (this.$u ? "UTC" : "");
-          switch (f3) {
-            case h:
-              return r3 ? l2(1, 0) : l2(31, 11);
-            case c:
-              return r3 ? l2(1, M3) : l2(0, M3 + 1);
-            case o2:
-              var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
-              return l2(r3 ? m3 - D2 : m3 + (6 - D2), M3);
-            case a:
-            case d:
-              return $2(v2 + "Hours", 0);
-            case u:
-              return $2(v2 + "Minutes", 1);
-            case s2:
-              return $2(v2 + "Seconds", 2);
-            case i:
-              return $2(v2 + "Milliseconds", 3);
-            default:
-              return this.clone();
-          }
-        }, m2.endOf = function(t3) {
-          return this.startOf(t3, false);
-        }, m2.$set = function(t3, e3) {
-          var n3, o3 = b.p(t3), f3 = "set" + (this.$u ? "UTC" : ""), l2 = (n3 = {}, n3[a] = f3 + "Date", n3[d] = f3 + "Date", n3[c] = f3 + "Month", n3[h] = f3 + "FullYear", n3[u] = f3 + "Hours", n3[s2] = f3 + "Minutes", n3[i] = f3 + "Seconds", n3[r2] = f3 + "Milliseconds", n3)[o3], $2 = o3 === a ? this.$D + (e3 - this.$W) : e3;
-          if (o3 === c || o3 === h) {
-            var y2 = this.clone().set(d, 1);
-            y2.$d[l2]($2), y2.init(), this.$d = y2.set(d, Math.min(this.$D, y2.daysInMonth())).$d;
-          } else
-            l2 && this.$d[l2]($2);
-          return this.init(), this;
-        }, m2.set = function(t3, e3) {
-          return this.clone().$set(t3, e3);
-        }, m2.get = function(t3) {
-          return this[b.p(t3)]();
-        }, m2.add = function(r3, f3) {
-          var d2, l2 = this;
-          r3 = Number(r3);
-          var $2 = b.p(f3), y2 = function(t3) {
-            var e3 = O(l2);
-            return b.w(e3.date(e3.date() + Math.round(t3 * r3)), l2);
-          };
-          if ($2 === c)
-            return this.set(c, this.$M + r3);
-          if ($2 === h)
-            return this.set(h, this.$y + r3);
-          if ($2 === a)
-            return y2(1);
-          if ($2 === o2)
-            return y2(7);
-          var M3 = (d2 = {}, d2[s2] = e2, d2[u] = n2, d2[i] = t2, d2)[$2] || 1, m3 = this.$d.getTime() + r3 * M3;
-          return b.w(m3, this);
-        }, m2.subtract = function(t3, e3) {
-          return this.add(-1 * t3, e3);
-        }, m2.format = function(t3) {
-          var e3 = this, n3 = this.$locale();
-          if (!this.isValid())
-            return n3.invalidDate || l;
-          var r3 = t3 || "YYYY-MM-DDTHH:mm:ssZ", i2 = b.z(this), s3 = this.$H, u2 = this.$m, a2 = this.$M, o3 = n3.weekdays, c2 = n3.months, f3 = n3.meridiem, h2 = function(t4, n4, i3, s4) {
-            return t4 && (t4[n4] || t4(e3, r3)) || i3[n4].slice(0, s4);
-          }, d2 = function(t4) {
-            return b.s(s3 % 12 || 12, t4, "0");
-          }, $2 = f3 || function(t4, e4, n4) {
-            var r4 = t4 < 12 ? "AM" : "PM";
-            return n4 ? r4.toLowerCase() : r4;
-          };
-          return r3.replace(y, function(t4, r4) {
-            return r4 || function(t5) {
-              switch (t5) {
-                case "YY":
-                  return String(e3.$y).slice(-2);
-                case "YYYY":
-                  return b.s(e3.$y, 4, "0");
-                case "M":
-                  return a2 + 1;
-                case "MM":
-                  return b.s(a2 + 1, 2, "0");
-                case "MMM":
-                  return h2(n3.monthsShort, a2, c2, 3);
-                case "MMMM":
-                  return h2(c2, a2);
-                case "D":
-                  return e3.$D;
-                case "DD":
-                  return b.s(e3.$D, 2, "0");
-                case "d":
-                  return String(e3.$W);
-                case "dd":
-                  return h2(n3.weekdaysMin, e3.$W, o3, 2);
-                case "ddd":
-                  return h2(n3.weekdaysShort, e3.$W, o3, 3);
-                case "dddd":
-                  return o3[e3.$W];
-                case "H":
-                  return String(s3);
-                case "HH":
-                  return b.s(s3, 2, "0");
-                case "h":
-                  return d2(1);
-                case "hh":
-                  return d2(2);
-                case "a":
-                  return $2(s3, u2, true);
-                case "A":
-                  return $2(s3, u2, false);
-                case "m":
-                  return String(u2);
-                case "mm":
-                  return b.s(u2, 2, "0");
-                case "s":
-                  return String(e3.$s);
-                case "ss":
-                  return b.s(e3.$s, 2, "0");
-                case "SSS":
-                  return b.s(e3.$ms, 3, "0");
-                case "Z":
-                  return i2;
-              }
-              return null;
-            }(t4) || i2.replace(":", "");
-          });
-        }, m2.utcOffset = function() {
-          return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
-        }, m2.diff = function(r3, d2, l2) {
-          var $2, y2 = this, M3 = b.p(d2), m3 = O(r3), v2 = (m3.utcOffset() - this.utcOffset()) * e2, g2 = this - m3, D2 = function() {
-            return b.m(y2, m3);
-          };
-          switch (M3) {
-            case h:
-              $2 = D2() / 12;
-              break;
-            case c:
-              $2 = D2();
-              break;
-            case f2:
-              $2 = D2() / 3;
-              break;
-            case o2:
-              $2 = (g2 - v2) / 6048e5;
-              break;
-            case a:
-              $2 = (g2 - v2) / 864e5;
-              break;
-            case u:
-              $2 = g2 / n2;
-              break;
-            case s2:
-              $2 = g2 / e2;
-              break;
-            case i:
-              $2 = g2 / t2;
-              break;
-            default:
-              $2 = g2;
-          }
-          return l2 ? $2 : b.a($2);
-        }, m2.daysInMonth = function() {
-          return this.endOf(c).$D;
-        }, m2.$locale = function() {
-          return D[this.$L];
-        }, m2.locale = function(t3, e3) {
-          if (!t3)
-            return this.$L;
-          var n3 = this.clone(), r3 = w(t3, e3, true);
-          return r3 && (n3.$L = r3), n3;
-        }, m2.clone = function() {
-          return b.w(this.$d, this);
-        }, m2.toDate = function() {
-          return new Date(this.valueOf());
-        }, m2.toJSON = function() {
-          return this.isValid() ? this.toISOString() : null;
-        }, m2.toISOString = function() {
-          return this.$d.toISOString();
-        }, m2.toString = function() {
-          return this.$d.toUTCString();
-        }, M2;
-      }(), k = _.prototype;
-      return O.prototype = k, [["$ms", r2], ["$s", i], ["$m", s2], ["$H", u], ["$W", a], ["$M", c], ["$y", h], ["$D", d]].forEach(function(t3) {
-        k[t3[1]] = function(e3) {
-          return this.$g(e3, t3[0], t3[1]);
-        };
-      }), O.extend = function(t3, e3) {
-        return t3.$i || (t3(e3, _, O), t3.$i = true), O;
-      }, O.locale = w, O.isDayjs = S, O.unix = function(t3) {
-        return O(1e3 * t3);
-      }, O.en = D[g], O.Ls = D, O.p = {}, O;
-    });
-  })(dayjs_min);
-  return dayjs_minExports$1;
-}
-var dayjs_minExports = requireDayjs_min();
-const dayjs = /* @__PURE__ */ getDefaultExportFromCjs(dayjs_minExports);
-=======
 var dayjs_minExports = {};
 var dayjs_min = {
   get exports() {
@@ -12290,7 +11978,6 @@ var dayjs_min = {
   });
 })(dayjs_min);
 const dayjs = dayjs_minExports;
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 var relativeTimeExports = {};
 var relativeTime$1 = {
   get exports() {
@@ -12354,11 +12041,7 @@ var zhCn = {
 };
 (function(module2, exports2) {
   !function(e2, _) {
-<<<<<<< HEAD
-    module2.exports = _(requireDayjs_min());
-=======
     module2.exports = _(dayjs_minExports);
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   }(commonjsGlobal, function(e2) {
     function _(e3) {
       return e3 && "object" == typeof e3 && "default" in e3 ? e3 : { default: e3 };
@@ -12372,312 +12055,6 @@ var zhCn = {
     return t2.default.locale(d, null, true), d;
   });
 })(zhCn);
-<<<<<<< HEAD
-=======
-const icons = {
-  "uicon-level": "",
-  "uicon-column-line": "",
-  "uicon-checkbox-mark": "",
-  "uicon-folder": "",
-  "uicon-movie": "",
-  "uicon-star-fill": "",
-  "uicon-star": "",
-  "uicon-phone-fill": "",
-  "uicon-phone": "",
-  "uicon-apple-fill": "",
-  "uicon-chrome-circle-fill": "",
-  "uicon-backspace": "",
-  "uicon-attach": "",
-  "uicon-cut": "",
-  "uicon-empty-car": "",
-  "uicon-empty-coupon": "",
-  "uicon-empty-address": "",
-  "uicon-empty-favor": "",
-  "uicon-empty-permission": "",
-  "uicon-empty-news": "",
-  "uicon-empty-search": "",
-  "uicon-github-circle-fill": "",
-  "uicon-rmb": "",
-  "uicon-person-delete-fill": "",
-  "uicon-reload": "",
-  "uicon-order": "",
-  "uicon-server-man": "",
-  "uicon-search": "",
-  "uicon-fingerprint": "",
-  "uicon-more-dot-fill": "",
-  "uicon-scan": "",
-  "uicon-share-square": "",
-  "uicon-map": "",
-  "uicon-map-fill": "",
-  "uicon-tags": "",
-  "uicon-tags-fill": "",
-  "uicon-bookmark-fill": "",
-  "uicon-bookmark": "",
-  "uicon-eye": "",
-  "uicon-eye-fill": "",
-  "uicon-mic": "",
-  "uicon-mic-off": "",
-  "uicon-calendar": "",
-  "uicon-calendar-fill": "",
-  "uicon-trash": "",
-  "uicon-trash-fill": "",
-  "uicon-play-left": "",
-  "uicon-play-right": "",
-  "uicon-minus": "",
-  "uicon-plus": "",
-  "uicon-info": "",
-  "uicon-info-circle": "",
-  "uicon-info-circle-fill": "",
-  "uicon-question": "",
-  "uicon-error": "",
-  "uicon-close": "",
-  "uicon-checkmark": "",
-  "uicon-android-circle-fill": "",
-  "uicon-android-fill": "",
-  "uicon-ie": "",
-  "uicon-IE-circle-fill": "",
-  "uicon-google": "",
-  "uicon-google-circle-fill": "",
-  "uicon-setting-fill": "",
-  "uicon-setting": "",
-  "uicon-minus-square-fill": "",
-  "uicon-plus-square-fill": "",
-  "uicon-heart": "",
-  "uicon-heart-fill": "",
-  "uicon-camera": "",
-  "uicon-camera-fill": "",
-  "uicon-more-circle": "",
-  "uicon-more-circle-fill": "",
-  "uicon-chat": "",
-  "uicon-chat-fill": "",
-  "uicon-bag-fill": "",
-  "uicon-bag": "",
-  "uicon-error-circle-fill": "",
-  "uicon-error-circle": "",
-  "uicon-close-circle": "",
-  "uicon-close-circle-fill": "",
-  "uicon-checkmark-circle": "",
-  "uicon-checkmark-circle-fill": "",
-  "uicon-question-circle-fill": "",
-  "uicon-question-circle": "",
-  "uicon-share": "",
-  "uicon-share-fill": "",
-  "uicon-shopping-cart": "",
-  "uicon-shopping-cart-fill": "",
-  "uicon-bell": "",
-  "uicon-bell-fill": "",
-  "uicon-list": "",
-  "uicon-list-dot": "",
-  "uicon-zhihu": "",
-  "uicon-zhihu-circle-fill": "",
-  "uicon-zhifubao": "",
-  "uicon-zhifubao-circle-fill": "",
-  "uicon-weixin-circle-fill": "",
-  "uicon-weixin-fill": "",
-  "uicon-twitter-circle-fill": "",
-  "uicon-twitter": "",
-  "uicon-taobao-circle-fill": "",
-  "uicon-taobao": "",
-  "uicon-weibo-circle-fill": "",
-  "uicon-weibo": "",
-  "uicon-qq-fill": "",
-  "uicon-qq-circle-fill": "",
-  "uicon-moments-circel-fill": "",
-  "uicon-moments": "",
-  "uicon-qzone": "",
-  "uicon-qzone-circle-fill": "",
-  "uicon-baidu-circle-fill": "",
-  "uicon-baidu": "",
-  "uicon-facebook-circle-fill": "",
-  "uicon-facebook": "",
-  "uicon-car": "",
-  "uicon-car-fill": "",
-  "uicon-warning-fill": "",
-  "uicon-warning": "",
-  "uicon-clock-fill": "",
-  "uicon-clock": "",
-  "uicon-edit-pen": "",
-  "uicon-edit-pen-fill": "",
-  "uicon-email": "",
-  "uicon-email-fill": "",
-  "uicon-minus-circle": "",
-  "uicon-minus-circle-fill": "",
-  "uicon-plus-circle": "",
-  "uicon-plus-circle-fill": "",
-  "uicon-file-text": "",
-  "uicon-file-text-fill": "",
-  "uicon-pushpin": "",
-  "uicon-pushpin-fill": "",
-  "uicon-grid": "",
-  "uicon-grid-fill": "",
-  "uicon-play-circle": "",
-  "uicon-play-circle-fill": "",
-  "uicon-pause-circle-fill": "",
-  "uicon-pause": "",
-  "uicon-pause-circle": "",
-  "uicon-eye-off": "",
-  "uicon-eye-off-outline": "",
-  "uicon-gift-fill": "",
-  "uicon-gift": "",
-  "uicon-rmb-circle-fill": "",
-  "uicon-rmb-circle": "",
-  "uicon-kefu-ermai": "",
-  "uicon-server-fill": "",
-  "uicon-coupon-fill": "",
-  "uicon-coupon": "",
-  "uicon-integral": "",
-  "uicon-integral-fill": "",
-  "uicon-home-fill": "",
-  "uicon-home": "",
-  "uicon-hourglass-half-fill": "",
-  "uicon-hourglass": "",
-  "uicon-account": "",
-  "uicon-plus-people-fill": "",
-  "uicon-minus-people-fill": "",
-  "uicon-account-fill": "",
-  "uicon-thumb-down-fill": "",
-  "uicon-thumb-down": "",
-  "uicon-thumb-up": "",
-  "uicon-thumb-up-fill": "",
-  "uicon-lock-fill": "",
-  "uicon-lock-open": "",
-  "uicon-lock-opened-fill": "",
-  "uicon-lock": "",
-  "uicon-red-packet-fill": "",
-  "uicon-photo-fill": "",
-  "uicon-photo": "",
-  "uicon-volume-off-fill": "",
-  "uicon-volume-off": "",
-  "uicon-volume-fill": "",
-  "uicon-volume": "",
-  "uicon-red-packet": "",
-  "uicon-download": "",
-  "uicon-arrow-up-fill": "",
-  "uicon-arrow-down-fill": "",
-  "uicon-play-left-fill": "",
-  "uicon-play-right-fill": "",
-  "uicon-rewind-left-fill": "",
-  "uicon-rewind-right-fill": "",
-  "uicon-arrow-downward": "",
-  "uicon-arrow-leftward": "",
-  "uicon-arrow-rightward": "",
-  "uicon-arrow-upward": "",
-  "uicon-arrow-down": "",
-  "uicon-arrow-right": "",
-  "uicon-arrow-left": "",
-  "uicon-arrow-up": "",
-  "uicon-skip-back-left": "",
-  "uicon-skip-forward-right": "",
-  "uicon-rewind-right": "",
-  "uicon-rewind-left": "",
-  "uicon-arrow-right-double": "",
-  "uicon-arrow-left-double": "",
-  "uicon-wifi-off": "",
-  "uicon-wifi": "",
-  "uicon-empty-data": "",
-  "uicon-empty-history": "",
-  "uicon-empty-list": "",
-  "uicon-empty-page": "",
-  "uicon-empty-order": "",
-  "uicon-man": "",
-  "uicon-woman": "",
-  "uicon-man-add": "",
-  "uicon-man-add-fill": "",
-  "uicon-man-delete": "",
-  "uicon-man-delete-fill": "",
-  "uicon-zh": "",
-  "uicon-en": ""
-};
-const props$k = defineMixin({
-  props: {
-    // 图标类名
-    name: {
-      type: String,
-      default: () => defProps.icon.name
-    },
-    // 图标颜色，可接受主题色
-    color: {
-      type: String,
-      default: () => defProps.icon.color
-    },
-    // 字体大小，单位px
-    size: {
-      type: [String, Number],
-      default: () => defProps.icon.size
-    },
-    // 是否显示粗体
-    bold: {
-      type: Boolean,
-      default: () => defProps.icon.bold
-    },
-    // 点击图标的时候传递事件出去的index（用于区分点击了哪一个）
-    index: {
-      type: [String, Number],
-      default: () => defProps.icon.index
-    },
-    // 触摸图标时的类名
-    hoverClass: {
-      type: String,
-      default: () => defProps.icon.hoverClass
-    },
-    // 自定义扩展前缀，方便用户扩展自己的图标库
-    customPrefix: {
-      type: String,
-      default: () => defProps.icon.customPrefix
-    },
-    // 图标右边或者下面的文字
-    label: {
-      type: [String, Number],
-      default: () => defProps.icon.label
-    },
-    // label的位置，只能右边或者下边
-    labelPos: {
-      type: String,
-      default: () => defProps.icon.labelPos
-    },
-    // label的大小
-    labelSize: {
-      type: [String, Number],
-      default: () => defProps.icon.labelSize
-    },
-    // label的颜色
-    labelColor: {
-      type: String,
-      default: () => defProps.icon.labelColor
-    },
-    // label与图标的距离
-    space: {
-      type: [String, Number],
-      default: () => defProps.icon.space
-    },
-    // 图片的mode
-    imgMode: {
-      type: String,
-      default: () => defProps.icon.imgMode
-    },
-    // 用于显示图片小图标时，图片的宽度
-    width: {
-      type: [String, Number],
-      default: () => defProps.icon.width
-    },
-    // 用于显示图片小图标时，图片的高度
-    height: {
-      type: [String, Number],
-      default: () => defProps.icon.height
-    },
-    // 用于解决某些情况下，让图标垂直居中的用途
-    top: {
-      type: [String, Number],
-      default: () => defProps.icon.top
-    },
-    // 是否阻止事件传播
-    stop: {
-      type: Boolean,
-      default: () => defProps.icon.stop
-    }
-  }
-});
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 const config = {
   // 信任的标签（保持标签名不变）
   trustTags: makeMap("a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,ruby,rt,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video"),
@@ -13662,11 +13039,7 @@ Lexer.prototype.endTag = function() {
     this.i++;
   }
 };
-<<<<<<< HEAD
 const props$k = defineMixin({
-=======
-const props$j = defineMixin({
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   props: {
     // 键盘的类型，number-数字键盘，card-身份证键盘，car-车牌号键盘
     mode: {
@@ -13750,7 +13123,6 @@ const props$j = defineMixin({
     }
   }
 });
-<<<<<<< HEAD
 const icons = {
   "uicon-level": "",
   "uicon-column-line": "",
@@ -14054,8 +13426,6 @@ const props$j = defineMixin({
     }
   }
 });
-=======
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 const props$i = defineMixin({
   props: {
     // 头像图片路径(不能为相对路径)
@@ -14459,6 +13829,39 @@ const props$c = defineMixin({
   }
 });
 const props$b = defineMixin({
+  props: {
+    // 键盘的类型，number-数字键盘，card-身份证键盘
+    mode: {
+      type: String,
+      default: () => defProps.numberKeyboard.value
+    },
+    // 是否显示键盘的"."符号
+    dotDisabled: {
+      type: Boolean,
+      default: () => defProps.numberKeyboard.dotDisabled
+    },
+    // 是否打乱键盘按键的顺序
+    random: {
+      type: Boolean,
+      default: () => defProps.numberKeyboard.random
+    }
+  }
+});
+const props$a = defineMixin({
+  props: {
+    // 是否打乱键盘按键的顺序
+    random: {
+      type: Boolean,
+      default: false
+    },
+    // 输入一个中文后，是否自动切换到英文
+    autoChange: {
+      type: Boolean,
+      default: false
+    }
+  }
+});
+const props$9 = defineMixin({
   props: {
     // 是否展示弹窗
     show: {
@@ -14537,39 +13940,6 @@ const props$b = defineMixin({
     }
   }
 });
-const props$a = defineMixin({
-  props: {
-    // 键盘的类型，number-数字键盘，card-身份证键盘
-    mode: {
-      type: String,
-      default: () => defProps.numberKeyboard.value
-    },
-    // 是否显示键盘的"."符号
-    dotDisabled: {
-      type: Boolean,
-      default: () => defProps.numberKeyboard.dotDisabled
-    },
-    // 是否打乱键盘按键的顺序
-    random: {
-      type: Boolean,
-      default: () => defProps.numberKeyboard.random
-    }
-  }
-});
-const props$9 = defineMixin({
-  props: {
-    // 是否打乱键盘按键的顺序
-    random: {
-      type: Boolean,
-      default: false
-    },
-    // 输入一个中文后，是否自动切换到英文
-    autoChange: {
-      type: Boolean,
-      default: false
-    }
-  }
-});
 const props$8 = defineMixin({
   props: {
     // 滑块的移动过渡时间，单位ms

dist/dev/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.js

@@ -1,108 +0,0 @@
-"use strict";
-const common_vendor = require("../../common/vendor.js");
-if (!Array) {
-  const _easycom_up_icon2 = common_vendor.resolveComponent("up-icon");
-  const _easycom_hs_button2 = common_vendor.resolveComponent("hs-button");
-  const _easycom_up_popup2 = common_vendor.resolveComponent("up-popup");
-  (_easycom_up_icon2 + _easycom_hs_button2 + _easycom_up_popup2)();
-}
-const _easycom_up_icon = () => "../../node-modules/uview-plus/components/u-icon/u-icon.js";
-const _easycom_hs_button = () => "../hs-button/hs-button.js";
-const _easycom_up_popup = () => "../../node-modules/uview-plus/components/u-popup/u-popup.js";
-if (!Math) {
-  (_easycom_up_icon + _easycom_hs_button + _easycom_up_popup)();
-}
-const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
-  __name: "hs-popup-evaluate",
-<<<<<<< HEAD
-  props: ["show", "mode", "insetBottom", "round", "closeable", "bgColor"],
-=======
-  props: [
-    "show",
-    "mode",
-    "insetBottom",
-    "round",
-    "closeable",
-    "bgColor",
-    "params"
-  ],
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
-  emits: ["onSubmit", "onClose"],
-  setup(__props, { emit }) {
-    const props = __props;
-    const rating = common_vendor.ref(-1);
-    const evaluateObj = {
-      1: "非常差",
-      2: "比较差",
-      3: "一般",
-      4: "满意",
-      5: "非常满意"
-    };
-    const onClickCurrent = (idx) => {
-      console.log(idx, "idx");
-      rating.value = idx;
-    };
-    const onClose = () => {
-      emit("onClose");
-    };
-    const onSubmit = () => {
-      if ((rating == null ? void 0 : rating.value) > -1) {
-<<<<<<< HEAD
-        emit("onSubmit", { rating: rating.value });
-      } else {
-        common_vendor.index.showToast({
-          title: "请先评价",
-=======
-        emit("onSubmit", { rating: rating.value, ...props == null ? void 0 : props.params });
-      } else {
-        common_vendor.index.showToast({
-          title: "请选择星星评价！",
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
-          icon: "none"
-        });
-      }
-    };
-    return (_ctx, _cache) => {
-      return common_vendor.e({
-        a: common_vendor.f(5, (i, index, i0) => {
-          return {
-            a: index,
-            b: common_vendor.o(($event) => onClickCurrent(i), index),
-            c: "ad578632-1-" + i0 + ",ad578632-0",
-            d: common_vendor.p({
-              name: "star-fill",
-              size: "32",
-              color: index < rating.value ? "#FFC53D" : "#F3F3F4"
-            })
-          };
-        }),
-        b: rating.value > -1
-      }, rating.value > -1 ? {
-        c: common_vendor.t(evaluateObj[rating.value])
-      } : {}, {
-        d: common_vendor.o(onSubmit),
-        e: common_vendor.p({
-          type: "primary",
-          label: "提交评价",
-          size: "md"
-        }),
-        f: common_vendor.o(onClose),
-        g: common_vendor.p({
-          customStyle: (props == null ? void 0 : props.insetBottom) ? {
-            bottom: "calc(env(safe-area-inset-bottom) + 48px)"
-          } : {},
-          overlayStyle: (props == null ? void 0 : props.insetBottom) ? {
-            bottom: "calc(env(safe-area-inset-bottom) + 48px)"
-          } : {},
-          show: props.show,
-          mode: (props == null ? void 0 : props.mode) || "top",
-          round: (props == null ? void 0 : props.round) || 0,
-          closeable: props == null ? void 0 : props.closeable,
-          bgColor: props == null ? void 0 : props.bgColor
-        })
-      });
-    };
-  }
-});
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ad578632"], ["__file", "/Users/zsq/Sources/github/2025property-pay/pay-customer/src/components/hs-popup-evaluate/hs-popup-evaluate.vue"]]);
-wx.createComponent(Component);

dist/dev/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.json

@@ -1,8 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "up-icon": "../../node-modules/uview-plus/components/u-icon/u-icon",
-    "hs-button": "../hs-button/hs-button",
-    "up-popup": "../../node-modules/uview-plus/components/u-popup/u-popup"
-  }
-}

dist/dev/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.wxml

@@ -1 +0,0 @@
-<up-popup wx:if="{{g}}" class="data-v-ad578632" u-s="{{['d']}}" bindclose="{{f}}" u-i="ad578632-0" bind:__l="__l" u-p="{{g}}"><view class="popup_slot_content data-v-ad578632"><view class="popup_slot_title data-v-ad578632"> 邀请您对工单进行评价 </view><view class="star_contents_body data-v-ad578632"><up-icon wx:for="{{a}}" wx:for-item="i" wx:key="a" class="data-v-ad578632" bindclick="{{i.b}}" u-i="{{i.c}}" bind:__l="__l" u-p="{{i.d}}"></up-icon></view><view wx:if="{{b}}" class="evaluate_text data-v-ad578632">{{c}}</view><view wx:else class="evaluate_text no_evaluate_text data-v-ad578632"> 请点击星星进行评价 </view><view class="popup_footer data-v-ad578632"><hs-button wx:if="{{e}}" class="data-v-ad578632" bindclick="{{d}}" u-i="ad578632-2,ad578632-0" bind:__l="__l" u-p="{{e}}"/></view></view></up-popup>

dist/dev/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.wxss

@@ -1,36 +0,0 @@
-.data-v-ad578632 .u-transition {
-  padding-bottom: calc(env(safe-area-inset-bottom) + 48px) !important;
-}
-.popup_slot_content.data-v-ad578632 {
-  border-top-left-radius: 30rpx;
-  border-top-right-radius: 30rpx;
-  overflow: hidden;
-  background: linear-gradient(180deg, #deefff 0%, #ffffff 26%, #ffffff 100%);
-  min-height: 300rpx;
-}
-.popup_slot_title.data-v-ad578632 {
-  color: #3d3d3d;
-  font-size: 32rpx;
-  text-align: center;
-  line-height: 100rpx;
-}
-.star_contents_body.data-v-ad578632 {
-  display: flex;
-  flex: 1;
-  gap: 10px;
-  align-items: center;
-  padding: 30rpx 0;
-  justify-content: center;
-}
-.evaluate_text.data-v-ad578632 {
-  text-align: center;
-  font-size: 28rpx;
-  font-weight: 500;
-  padding: 20rpx 0;
-}
-.no_evaluate_text.data-v-ad578632 {
-  color: #666666;
-}
-.popup_footer.data-v-ad578632 {
-  padding: 40rpx 30rpx 0 30rpx;
-}

dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js

@@ -52,7 +52,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       let day1 = common_libraries_day.getTheFutureDay(1);
       let day2 = common_libraries_day.getTheFutureDay(2);
       let timeSlots = common_libraries_day.generateTimeSlots();
-<<<<<<< HEAD
       listData.value = [
         [
           { label: "今天", value: day0 },
@@ -61,26 +60,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         ],
         timeSlots
       ];
-=======
-      if (day0 == null ? void 0 : day0.length) {
-        listData.value = [
-          [
-            { label: "今天", value: day0 },
-            { label: "明天", value: day1 },
-            { label: "后天", value: day2 }
-          ],
-          timeSlots
-        ];
-      } else {
-        listData.value = [
-          [
-            { label: "明天", value: day1 },
-            { label: "后天", value: day2 }
-          ],
-          timeSlots
-        ];
-      }
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
       console.log(dayInfo, "day1");
     };
     const onColumnchange = (e) => {

dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss

@@ -1,9 +1,5 @@
 .cell_content.data-v-1a4ad8b9 {
-<<<<<<< HEAD
   padding: 16rpx 0;
-=======
-  padding: 5rpx 0;
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   display: flex;
   align-items: center;
   justify-content: space-between;

dist/dev/mp-weixin/gen/Enums.js

@@ -64,11 +64,7 @@ const HouseWorkOrdersComplaintTypeEnum = {
 };
 const HouseWorkOrdersLocationEnum = {
   "CommonArea": { "text": "公共区域", "color": "#ff0000", "value": "CommonArea" },
-<<<<<<< HEAD
-  "MyHome": { "text": "我家", "color": "#00ff00", "value": "MyHome" }
-=======
   "MyHome": { "text": "房屋", "color": "#00ff00", "value": "MyHome" }
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 };
 const HouseWorkOrdersStatusEnum = {
   "Pending": { "text": "待处理", "color": "#FFA500", "value": "Pending" },

dist/dev/mp-weixin/node-modules/uview-plus/components/u-car-keyboard/u-car-keyboard.js

@@ -2,7 +2,7 @@
 const common_vendor = require("../../../../common/vendor.js");
 const _sfc_main = {
   name: "u-car-keyboard",
-  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$11],
+  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$10],
   data() {
     return {
       // 车牌输入时，abc=true为输入车牌号码，bac=false为输入省份中文简称

dist/dev/mp-weixin/node-modules/uview-plus/components/u-icon/u-icon.js

@@ -6,7 +6,7 @@ const _sfc_main = {
     return {};
   },
   emits: ["click"],
-  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props],
+  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$1],
   computed: {
     uClasses() {
       let classes = [];

dist/dev/mp-weixin/node-modules/uview-plus/components/u-keyboard/u-keyboard.js

@@ -5,11 +5,7 @@ const _sfc_main = {
   data() {
     return {};
   },
-<<<<<<< HEAD
   mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props],
-=======
-  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$1],
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
   emits: ["change", "close", "confirm", "cancel", "backspace"],
   methods: {
     change(e) {

dist/dev/mp-weixin/node-modules/uview-plus/components/u-number-keyboard/u-number-keyboard.js

@@ -2,7 +2,7 @@
 const common_vendor = require("../../../../common/vendor.js");
 const _sfc_main = {
   name: "u-number-keyboard",
-  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$10],
+  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$9],
   data() {
     return {
       backspace: "backspace",

dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js

@@ -2,7 +2,7 @@
 const common_vendor = require("../../../../common/vendor.js");
 const _sfc_main = {
   name: "u-popup",
-  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$9],
+  mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$11],
   data() {
     return {
       overlayDuration: this.duration + 50

dist/dev/mp-weixin/pages/transfer/index.js

@@ -33,14 +33,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
               url: `/INDEX/pay/index?id=${data[1]}`
             });
           }
-<<<<<<< HEAD
-=======
-          if (data[0] === "1") {
-            common_vendor.index.redirectTo({
-              url: `/WORKORDER/pay/index?id=${data[1]}`
-            });
-          }
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
         }
       } else {
         common_vendor.index.showModal({

src/WORKORDER/show/index.vue

@@ -10,10 +10,10 @@
             />
           </view>
           <view class="btn_type">
-            <hs-enum-tag
+            <!-- <hs-enum-tag
               :value="useModel?.dataShow?.value?.location"
               :Enums="HouseWorkOrdersLocationEnum"
-            />
+            /> -->
           </view>
         </view>
         <view :class="`btn_status btn_status_${useModel?.dataShow?.value?.status}`">

src/WORKORDER/show/method.ts

@@ -11,7 +11,7 @@ const getShow = (id: string) => {
 
 const getHouseWorkLogs = (id: number) => {
   getApiLoading(Apis.WorkOrder.HouseWorkLogs.List, { house_work_orders_id: id }).then(res => {
-    useModel.logsData.value = res?.data
+    // useModel.logsData.value = res?.data
   })
 }
 
@@ -126,30 +126,30 @@ export default {
     uni.navigateTo({
       url: `/WORKORDER/update_work_rework/index?id=${useModel?.dataShow?.value?.id}`
     })
-  },
-  handleEvaluate() {
-    // uni.navigateTo({
-    //   url: '/ME/user_evaluate/index'
-    // })
-    useModel.showEvaluate.value = true
-  },
-  handlepopupClose() {
-    useModel.showEvaluate.value = false
-    uni.showToast({
-      title: '评价已提交',
-      icon: 'none'
-    })
-  },
-  handlePhoneCall() {
-    if (useModel?.dataShow?.value?.assign_employee?.phone) {
-      uni.makePhoneCall({
-        phoneNumber: useModel?.dataShow?.value?.assign_employee?.phone //仅为示例，并非真实的电话号码
-      })
-    } else {
-      uni.showToast({
-        title: '暂无电话号码',
-        icon: 'none'
-      })
-    }
   }
+  // handleEvaluate() {
+  //   // uni.navigateTo({
+  //   //   url: '/ME/user_evaluate/index'
+  //   // })
+  //   useModel.showEvaluate.value = true
+  // },
+  // handlepopupClose() {
+  //   useModel.showEvaluate.value = false
+  //   uni.showToast({
+  //     title: '评价已提交',
+  //     icon: 'none'
+  //   })
+  // },
+  // handlePhoneCall() {
+  //   if (useModel?.dataShow?.value?.assign_employee?.phone) {
+  //     uni.makePhoneCall({
+  //       phoneNumber: useModel?.dataShow?.value?.assign_employee?.phone //仅为示例，并非真实的电话号码
+  //     })
+  //   } else {
+  //     uni.showToast({
+  //       title: '暂无电话号码',
+  //       icon: 'none'
+  //     })
+  //   }
+  // }
 }

src/gen/ApiTypes.d.ts

@@ -296,7 +296,6 @@ declare namespace ApiTypes {
   }
   namespace Msg {
     namespace MsgPropertyAnnouncements {
-<<<<<<< HEAD
       type List = {
         "title"?: string; // 模糊搜索：标题 
       };
@@ -309,38 +308,6 @@ declare namespace ApiTypes {
     namespace Notification {
     }
   }
-  namespace WorkOrder {
-    namespace HouseWorkOrders {
-      type List = {
-        "status"?: string; // 工单状态,[enum:HouseWorkOrdersStatusEnum] 
-      };
-      type Store = {
-        "type": string; // 工单类型,[enum:HouseWorkOrdersTypeEnum] 
-        "complaint_type"?: string; // 投诉类型[enum:HouseWorkOrdersComplaintTypeEnum] 
-        "location"?: string; // 报修位置[enum:HouseWorkOrdersLocationEnum] 
-        "content": string; // 工单内容 
-        "reporter_name"?: string; // 上报人名称 
-        "reporter_phone"?: string; // 上报人手机 
-        "contact_phone"?: string; // 联系人电话 
-        "attachments"?: string[]; // 工单附件 
-        "expect_start_time"?: Date; // 期望上门开始时间 
-        "expect_end_time"?: Date; // 期望上门最后时间 
-        "is_anonymous"?: boolean; // 是否匿名 
-        "asset_houses_id": number; // 资产房屋id,[ref:asset_houses] 
-=======
-      type List = {
-        "title"?: string; // 模糊搜索：标题 
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
-      };
-      type Show = {
-        "id": number; // id 
-      };
-    }
-  }
-  namespace WechatWork {
-    namespace Notification {
-    }
-  }
   namespace WorkOrder {
     namespace HouseWorkLogs {
       type List = {

src/gen/Enums.ts

@@ -154,11 +154,7 @@ export const BannersTypeEnum = {
 
 // 缓存类型
 export const CacheTypeEnum = {
-<<<<<<< HEAD
+  'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#aaa359","value":"MobilePhoneVerificationCode"}, 
-  'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#f61ce1","value":"MobilePhoneVerificationCode"}, 
-=======
-  'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#92595d","value":"MobilePhoneVerificationCode"}, 
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 };
 
 // CompaniesMerchantTypeEnum
@@ -186,6 +182,11 @@ export const CompanyAppsWorkTypeEnum = {
   'WorkWechat': {"text":"企微","color":"#0091ea","value":"WorkWechat"}, 
 };
 
+// CompanyConfigsConfigKeyEnum
+export const CompanyConfigsConfigKeyEnum = {
+  'Theme': {"text":"主题色","color":"#3b82f6","value":"Theme"}, 
+};
+
 // CompanyEmployeeBacklogsStatusEnum
 export const CompanyEmployeeBacklogsStatusEnum = {
   'Pending': {"text":"待办","color":"#FF6600","value":"Pending"}, 
@@ -475,6 +476,16 @@ export const HouseOccupantsStatusEnum = {
   'Unbound': {"text":"解绑","color":"#f5222d","value":"Unbound"}, 
 };
 
+// HouseOrderRefundsRefundStatusEnum
+export const HouseOrderRefundsRefundStatusEnum = {
+  'Requested': {"text":"已申请","color":"#2196f3","value":"Requested"}, 
+  'Reviewing': {"text":"审核中","color":"#ff9800","value":"Reviewing"}, 
+  'Rejected': {"text":"已拒绝","color":"#f44336","value":"Rejected"}, 
+  'Processing': {"text":"退款中","color":"#9c27b0","value":"Processing"}, 
+  'Refunded': {"text":"已退款","color":"#4caf50","value":"Refunded"}, 
+  'Failed': {"text":"退款失败","color":"#e91e63","value":"Failed"}, 
+};
+
 // 订单状态枚举
 export const HouseOrdersOrderStatusEnum = {
   'Pending': {"text":"待支付","color":"#facc15","value":"Pending"}, 
@@ -491,6 +502,8 @@ export const HouseOrdersPaymentMethodEnum = {
   'BankTransfer': {"text":"银行转账","color":"#6c757d","value":"BankTransfer"}, 
   'TongLian': {"text":"通联支付","color":"#ff9f0a","value":"TongLian"}, 
   'Prepayment': {"text":"预缴支付","color":"#f59e0b","value":"Prepayment"}, 
+  'POS': {"text":"POS机","color":"#8b5cf6","value":"POS"}, 
+  'Cash': {"text":"现金","color":"#dc2626","value":"Cash"}, 
 };
 
 // HousePrepaymentLogsTypeEnum
@@ -582,9 +595,6 @@ export const HouseWorkOrdersLevelEnum = {
 // HouseWorkOrdersLocationEnum
 export const HouseWorkOrdersLocationEnum = {
   'CommonArea': {"text":"公共区域","color":"#ff0000","value":"CommonArea"}, 
-<<<<<<< HEAD
-  'MyHome': {"text":"我家","color":"#00ff00","value":"MyHome"}, 
-=======
   'MyHome': {"text":"房屋","color":"#00ff00","value":"MyHome"}, 
 };
 
@@ -593,7 +603,6 @@ export const HouseWorkOrdersRefundStatusEnum = {
   'Refunding': {"text":"退款中","color":"#FFA500","value":"Refunding"}, 
   'Refunded': {"text":"已退款","color":"#28A745","value":"Refunded"}, 
   'PartialRefund': {"text":"部分退款","color":"#17A2B8","value":"PartialRefund"}, 
->>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
 };
 
 // HouseWorkOrdersStatusEnum
@@ -637,6 +646,7 @@ export const SexEnum = {
 export const SysModuleEnum = {
   'Admin': {"text":"管理员","color":"#cf1322","value":"Admin"}, 
   'Customer': {"text":"客户","color":"#d4b106","value":"Customer"}, 
+  'Company': {"text":"机构","color":"#1890ff","value":"Company"}, 
 };
 
 // SysPermissionsTypeEnum

src/pages.json

@@ -208,120 +208,6 @@
       ]
     },
 
-    {
-      "root": "ME",
-      "pages": [
-        {
-          "path": "feedback/index",
-          "style": {
-            "navigationBarTitleText": "意见反馈"
-          }
-        },
-        {
-          "path": "activities_show/index",
-          "style": {
-            "navigationBarTitleText": "活动详情"
-          }
-        },
-        {
-          "path": "activities_list/index",
-          "style": {
-            "navigationBarTitleText": "我的活动"
-          }
-        },
-        {
-          "path": "wallet/index",
-          "style": {
-            "navigationBarTitleText": "我的钱包",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "recharge/index",
-          "style": {
-            "navigationBarTitleText": "充值"
-          }
-        },
-        {
-          "path": "recharge_record/index",
-          "style": {
-            "navigationBarTitleText": "充值记录"
-          }
-        },
-        {
-          "path": "advance_payment_house/index",
-          "style": {
-            "navigationBarTitleText": "管理预缴房屋"
-          }
-        },
-        {
-          "path": "me_invoice/list/index",
-          "style": {
-            "navigationBarTitleText": "发票抬头"
-          }
-        },
-        {
-          "path": "me_invoice/add/index",
-          "style": {
-            "navigationBarTitleText": "添加发票抬头"
-          }
-        },
-        {
-          "path": "vehicle_management/list/index",
-          "style": {
-            "navigationBarTitleText": "车辆管理"
-          }
-        },
-        {
-          "path": "vehicle_management/add/index",
-          "style": {
-            "navigationBarTitleText": "添加车辆"
-          }
-        },
-        {
-          "path": "issue_invoice/index",
-          "style": {
-            "navigationBarTitleText": "开具发票"
-          }
-        },
-        {
-          "path": "payment_pre_stored/index",
-          "style": {
-            "navigationBarTitleText": "房屋预缴"
-          }
-        },
-        {
-          "path": "pre_stored_form/index",
-          "style": {
-            "navigationBarTitleText": "房屋预缴"
-          }
-        },
-        {
-          "path": "user_evaluate/index",
-          "style": {
-            "navigationBarTitleText": "工单评价"
-          }
-        },
-        {
-          "path": "income_expenditure/index",
-          "style": {
-            "navigationBarTitleText": "收支记录"
-          }
-        },
-        {
-          "path": "parking_fee/index",
-          "style": {
-            "navigationBarTitleText": "停车缴费"
-          }
-        },
-        {
-          "path": "work_order_home/index",
-          "style": {
-            "navigationBarTitleText": "工单提报"
-          }
-        }
-      ]
-    },
     {
       "root": "INDEX",
       "pages": [