diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue index ab1c71b..6e9903e 100644 --- a/src/pages/refund/apply.vue +++ b/src/pages/refund/apply.vue @@ -25,7 +25,7 @@ const state = reactive({ const uploadApplyPicUrls = ref | string>>([]) // 补充凭证图片 const applyPicUrls = computed(() => uploadApplyPicUrls.value.map((item: any) => JSON.parse(item.response).data.url).join(",")) -const applyForm = reactive({ +const applyForm = reactive({ way: data.payType[0].type, remark: "", reason: "", @@ -92,6 +92,7 @@ const radioChange = (e: any) => { const doSubmit = async () => { if (isEmpty(applyForm.reasonStr)) return uni.showToast({ title: "请选择申请原因", icon: "none" }) if (!applyPicUrls.value.length) return uni.showToast({ title: "请补充凭证图片", icon: "none" }) + if (isEmpty(applyForm.remark.trim())) return uni.showToast({ title: "请填写相关描述", icon: "none" }) const _pa = { way: applyForm.way, refundPrice: state.detail.practicalTotalPrice, diff --git a/src/pages/shop/brandDetail.vue b/src/pages/shop/brandDetail.vue index 422a3c0..d4c37da 100644 --- a/src/pages/shop/brandDetail.vue +++ b/src/pages/shop/brandDetail.vue @@ -91,31 +91,18 @@ const toDetail = async (v: any) => { > - + - - {{ v.name.length > 7 ? v.name.substring(0, 7) + "..." : v.name }} - {{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }} - + {{ v.name }} - - - - - {{ v.phone }} + + + + + {{ v.phone }} + + + {{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }} 营业时间: @@ -124,22 +111,7 @@ const toDetail = async (v: any) => { {{ v.jobTime?.split(",")[2] ? "晚:" + v.jobTime?.split(",")[2] : "" }} - - - + 地址: {{ v.addressDes }} diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index 43ead01..f9909e4 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -19,41 +19,26 @@ - + - - - {{ state.detail.name?.length > 7 ? state.detail.name.substring(0, 7) + "..." : state.detail.name }} - - - {{ state.detail.deptName?.length > 5 ? state.detail.deptName.substring(0, 5) + "..." : state.detail.deptName }} - - + {{ state.detail.name }} - - - - - {{ state.detail.phone }} - - 联系商家 + + + + + {{ state.detail.phone }} + + 联系商家 + + + + {{ state.detail.deptName?.length > 5 ? state.detail.deptName.substring(0, 5) + "..." : state.detail.deptName }} + {{ state.detail.jobTime == ",," ? "" : "营业时间:" }} @@ -62,22 +47,7 @@ {{ state.detail.jobTime?.split(",")[2] ? "晚:" + state.detail.jobTime?.split(",")[2] : "" }} - - - + 地址: {{ state.detail.addressDes }} diff --git a/src/pages/tabbar/coopMerchant.vue b/src/pages/tabbar/coopMerchant.vue index bce69d4..651c1ab 100644 --- a/src/pages/tabbar/coopMerchant.vue +++ b/src/pages/tabbar/coopMerchant.vue @@ -54,36 +54,21 @@ const toDetail = async (v: any) => { > - + - - {{ v.name.length > 7 ? v.name.substring(0, 6) + "..." : v.name }} - {{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }} + + {{ v.name }} + - + - - - + {{ v.phone }} - 共{{ v.mchCount }}家 + {{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }} 营业时间: @@ -92,22 +77,7 @@ const toDetail = async (v: any) => { {{ v.jobTime?.split(",")[2] ? "晚:" + v.jobTime?.split(",")[2] : "" }} - - - + 地址: {{ v.addressDes }} diff --git a/src/pages/tabbar/selfMerchant.vue b/src/pages/tabbar/selfMerchant.vue index 8c9c03e..08bd490 100644 --- a/src/pages/tabbar/selfMerchant.vue +++ b/src/pages/tabbar/selfMerchant.vue @@ -60,22 +60,7 @@ const toDetail = async (v: any) => { - - - + {{ v.phone }} @@ -85,22 +70,7 @@ const toDetail = async (v: any) => { {{ v.jobTime?.split(",")[2] ? "晚:" + v.jobTime?.split(",")[2] : "" }} - - - + 地址: {{ v.addressDes }} diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts index 5e063b8..0b8c890 100644 --- a/src/sheep/utils/request.ts +++ b/src/sheep/utils/request.ts @@ -80,12 +80,12 @@ async function handleShLogin(): Promise { uni.showLoading({ title: "登录中...", mask: true }) const userInfo = await (window as any).CP2.getUserInfo() - if (userInfo.code == 0) { + if (userInfo.code == 0 || !userInfo.accountId || !userInfo.sessionId) { uni.showToast({ title: "获取诗画用户信息失败", icon: "none" }) return false } - const { accountId = "", sessionId = "" } = userInfo.data + const { accountId, sessionId } = userInfo.data const response = await userApi.authsh({ accountId, sessionId }) // const response = await userApi.authsh({ accountId: "67e790d6a95d5a7b507e53dd", sessionId: "67fdff553cbc284e352ebb4d" }) // 测试 diff --git a/src/static/page/address.svg b/src/static/page/address.svg new file mode 100644 index 0000000..13f6416 --- /dev/null +++ b/src/static/page/address.svg @@ -0,0 +1,16 @@ + + + \ No newline at end of file diff --git a/src/static/page/phone.svg b/src/static/page/phone.svg new file mode 100644 index 0000000..74b8f6b --- /dev/null +++ b/src/static/page/phone.svg @@ -0,0 +1,16 @@ + + + \ No newline at end of file