diff --git a/components/dForm/index.vue b/components/dForm/index.vue index 5e36cea..24ba612 100644 --- a/components/dForm/index.vue +++ b/components/dForm/index.vue @@ -12,10 +12,11 @@ + - + 提交 @@ -131,11 +137,22 @@ }) } + const setData = (data) => { + list.forEach(item => { + const { key } = item + formData[key] = data[key] || null + }) + } + + const getData = () => { + return formData + } + const validate = () => { return dFormRef.value.validate() } - defineExpose({ validate }) + defineExpose({ setData, getData, validate }) \ No newline at end of file diff --git a/otherPages/authentication/connectAddress/detail.vue b/otherPages/authentication/connectAddress/detail.vue new file mode 100644 index 0000000..e738748 --- /dev/null +++ b/otherPages/authentication/connectAddress/detail.vue @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/otherPages/authentication/connectAddress/index.vue b/otherPages/authentication/connectAddress/index.vue index d3dbdc0..c546a5a 100644 --- a/otherPages/authentication/connectAddress/index.vue +++ b/otherPages/authentication/connectAddress/index.vue @@ -1,53 +1,123 @@ - \ No newline at end of file diff --git a/otherPages/authentication/examination/end.vue b/otherPages/authentication/examination/end.vue index 523e00d..cc2bb15 100644 --- a/otherPages/authentication/examination/end.vue +++ b/otherPages/authentication/examination/end.vue @@ -22,11 +22,12 @@ + - 真实姓名:刘思恩 + {{ `真实姓名:${form.name}` }} - 身份证号码:48234792837458923 + {{ `身份证号码:${form.idCard}` }} @@ -44,9 +45,13 @@ 履约保证金缴纳 - + 去缴纳 + + 请缴纳履约保证金,保证金注销时可申请退还 @@ -66,11 +71,11 @@ 添加客服微信 - - 去缴纳 + + 请自行添加 - + 微信二维码 @@ -89,20 +94,25 @@ 服务工具准备 - - 查看工具包 + + + 查看工具包 + 所在地区: - + + {{ form.area ? form.area : '请选择' }} + + 详细地址: - + @@ -119,69 +129,64 @@ - + \ No newline at end of file diff --git a/otherPages/authentication/serve/popupServeSelect.vue b/otherPages/authentication/serve/popupServeSelect.vue new file mode 100644 index 0000000..1989f2e --- /dev/null +++ b/otherPages/authentication/serve/popupServeSelect.vue @@ -0,0 +1,116 @@ + + + + + \ No newline at end of file diff --git a/otherPages/authentication/serve/popupTypeSelect.vue b/otherPages/authentication/serve/popupTypeSelect.vue new file mode 100644 index 0000000..c4af8db --- /dev/null +++ b/otherPages/authentication/serve/popupTypeSelect.vue @@ -0,0 +1,120 @@ + + + + + \ No newline at end of file diff --git a/otherPages/authentication/serve/record.vue b/otherPages/authentication/serve/record.vue index 5ae58b7..6428ba4 100644 --- a/otherPages/authentication/serve/record.vue +++ b/otherPages/authentication/serve/record.vue @@ -1,28 +1,49 @@ \ No newline at end of file diff --git a/otherPages/authentication/static/connectAddress/icon-empty.png b/otherPages/authentication/static/connectAddress/icon-empty.png new file mode 100644 index 0000000..5352c68 Binary files /dev/null and b/otherPages/authentication/static/connectAddress/icon-empty.png differ diff --git a/otherPages/myOrdersManage/bond/detail.vue b/otherPages/myOrdersManage/bond/detail.vue index 4d902e7..1a6aa05 100644 --- a/otherPages/myOrdersManage/bond/detail.vue +++ b/otherPages/myOrdersManage/bond/detail.vue @@ -2,37 +2,85 @@ - - 收入明细 - - - 支出明细 + + {{ tab.title }} - - - - - - 押金充值 - - - 2020-12-29 12:54:54 + + + + + + + {{ item.title }} + + + {{ item.createTime }} + - - - ¥200 + + {{ `¥${item.price}` }} + - - \ No newline at end of file diff --git a/otherPages/myOrdersManage/static/bond/bg-popup.png b/otherPages/myOrdersManage/static/bond/bg-popup.png new file mode 100644 index 0000000..654d8b9 Binary files /dev/null and b/otherPages/myOrdersManage/static/bond/bg-popup.png differ diff --git a/pages.json b/pages.json index d2fe40e..acb9e25 100644 --- a/pages.json +++ b/pages.json @@ -110,6 +110,11 @@ "style": { "navigationBarTitleText": "接单地址" } + }, { + "path": "connectAddress/detail", + "style": { + "navigationBarTitleText": "新增接单地址" + } }] }, { @@ -208,14 +213,14 @@ "navigationBarTitleText": "保证金" } }, { - "path": "withdrawal/index", + "path": "bond/refund", "style": { - "navigationBarTitleText": "提现" + "navigationBarTitleText": "保证金退还" } }, { - "path": "detail/index", + "path": "withdrawal/index", "style": { - "navigationBarTitleText": "保证金退还" + "navigationBarTitleText": "提现" } }, { "path": "transaction/index", diff --git a/otherPages/authentication/static/list/cat-active.png b/static/images/ydd/cat-active.png similarity index 100% rename from otherPages/authentication/static/list/cat-active.png rename to static/images/ydd/cat-active.png diff --git a/otherPages/authentication/static/list/cat.png b/static/images/ydd/cat.png similarity index 100% rename from otherPages/authentication/static/list/cat.png rename to static/images/ydd/cat.png diff --git a/otherPages/authentication/static/list/dog-active.png b/static/images/ydd/dog-active.png similarity index 100% rename from otherPages/authentication/static/list/dog-active.png rename to static/images/ydd/dog-active.png diff --git a/otherPages/authentication/static/list/dog.png b/static/images/ydd/dog.png similarity index 100% rename from otherPages/authentication/static/list/dog.png rename to static/images/ydd/dog.png diff --git a/otherPages/authentication/static/list/special-pet-active.png b/static/images/ydd/special-pet-active.png similarity index 100% rename from otherPages/authentication/static/list/special-pet-active.png rename to static/images/ydd/special-pet-active.png diff --git a/otherPages/authentication/static/list/special-pet.png b/static/images/ydd/special-pet.png similarity index 100% rename from otherPages/authentication/static/list/special-pet.png rename to static/images/ydd/special-pet.png