Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

zhengyiming

2 天以前 0e2cd06ac9a66da506a23002799cf2a398ff7c4c

 apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue

@@ -75,6 +75,19 @@
          ></ChooseInputWithSuppliers>
        </nut-form-item>
        <nut-form-item
          label="支付通道:"
          class="bole-form-item"
          prop="payAccess"
          label-width="90px"
          required
        >
          <ChooseInputWithPicker
            v-model="form.payAccess"
            placeholder="请选择支付通道"
            :value-enum="EnumUserBankCardAccessTextFormStandard"
          />
        </nut-form-item>
        <nut-form-item
          label="备注:"
          class="bole-form-item alignTop"
          prop="remark"
@@ -90,9 +103,9 @@
        </nut-form-item>
      </nut-form>
    </ContentScrollView>
    <PageFooter>
      <div class="addStandardOrder-price-wrapper">
        <div class="addStandardOrder-price-text">支付：</div>
    <PageFooter class="order-settle-bar">
      <div class="order-settle-price-wrapper">
        <div class="order-settle-price-label">支付：</div>
        <nut-price :price="totlePrice" size="large" />
      </div>
      <PageFooterBtn type="primary" class="business-card-btn" @click="goConfirm"
@@ -118,6 +131,7 @@
  List,
  ListItem,
  ChooseInputWithDatePicker,
  ChooseInputWithPicker,
} from '@12333/components';
import Taro from '@tarojs/taro';
import { RouterPath } from '@/constants';
@@ -125,7 +139,7 @@
import * as standardOrderServices from '@12333/services/apiV2/standardOrder';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import dayjs from 'dayjs';
import { EnumUserBankCardAccess } from '@12333/constants';
import { EnumUserBankCardAccess, EnumUserBankCardAccessTextFormStandard } from '@12333/constants';
import { Message } from '@12333/utils';

defineOptions({
@@ -147,6 +161,7 @@
  enterpriseEmployeeId: '',
  enterpriseEmployeeName: '',
  remark: '',
  payAccess: EnumUserBankCardAccess.WeChatPay,
});

const nowDate = dayjs().toDate();
@@ -169,6 +184,7 @@
  beginTime: [{ required: true, message: '请选择服务开始时间' }],
  endTime: [{ required: true, message: '请选择服务结束时间' }],
  enterpriseEmployeeId: [{ required: true, message: '请选择服务机构' }],
  payAccess: [{ required: true, message: '请选择支付通道' }],
});

const { isLoading, isError, detail, refetch } = useStandardServiceDetail({
@@ -198,7 +214,7 @@
const existAddress = computed(() => {
  return infiniteLoadingProps.value.flattenListData.map((x) => ({
    id: x.id,
    addressDetail: x.addressDetail,
    addressDetail: `${x.addressName}${x.addressDetail}`,
    cityName: '',
    countyName: '',
    provinceName: '',
@@ -273,12 +289,12 @@
    };
    let res = await standardOrderServices.addStandardOrder(params);
    if (res) {
      pay(res);
      payStandardOrder(res);
    }
  } catch (error) {}
}

async function pay(orderId: string) {
async function payStandardOrder(orderId: string) {
  try {
    let params: API.PayStandardOrderCommand = {
      id: orderId,
@@ -293,11 +309,13 @@
        paySign: res.paySign,
      });
      Message.success('支付成功');
      Taro.redirectTo({
        url: `${RouterPath.mineOrderDetail}?id=${orderId}`,
      });
    }
  } catch (error) {}
  } catch (error) {
  } finally {
    Taro.redirectTo({
      url: `${RouterPath.serciceDetail}?id=${id}`,
    });
  }
}
</script>

@@ -316,16 +334,18 @@
    }
  }

  .addStandardOrder-price-wrapper {
    display: flex;
    flex: 2;
    min-width: 0;
    align-items: center;
    padding-left: 28px;
  .order-settle-bar {
    .order-settle-price-wrapper {
      height: 100%;
      flex: 1;
      min-width: 0;
      display: flex;
      align-items: center;
      margin-left: 28px;

    .addStandardOrder-price-text {
      font-size: 32px;
      color: boleGetCssVar('text-color', 'primary');
      .order-settle-price-label {
        color: boleGetCssVar('text-color', 'primary');
      }
    }
  }
}