diff --git a/custom.page.js b/custom.page.js
index 65b573b..f2955fe 100644
--- a/custom.page.js
+++ b/custom.page.js
@@ -20,12 +20,16 @@ const config = {
// pagesInclude: ['ynyc/index.vue'],
// 广州移动
// pagesInclude: ['gzyd/login.vue'],
-<<<<<<< HEAD
- pagesInclude: ['physical/address.vue', 'physical/createAddress.vue'],
- // pagesInclude: ['physical/createAddress.vue'],
-=======
- pagesInclude: ['gzyd/index.vue'],
->>>>>>> 964dde74b2f18de014a39db01294f7e0d62fd7cc
+ // 实物需求
+ // pagesInclude: ['physical/login.vue'],
+ // pagesInclude: ['physical/index.vue'],
+ // pagesInclude: ['physical/orderDetail.vue'],
+ pagesInclude: [
+ 'physical/coupon.vue',
+ 'physical/redeem.vue',
+ 'physical/address.vue',
+ 'physical/createAddress.vue',
+ ],
}
export function getPages() {
diff --git a/dist/build/h5/index.html b/dist/build/h5/index.html
index fe54672..2c8e0ac 100644
--- a/dist/build/h5/index.html
+++ b/dist/build/h5/index.html
@@ -1,7 +1,7 @@
-
+
-
+
@@ -19,16 +19,16 @@
场景营销
-
-
+
+
-
+
-
+
diff --git a/src/pages/physical/api.ts b/src/pages/physical/api.ts
index 503960d..7aef1db 100644
--- a/src/pages/physical/api.ts
+++ b/src/pages/physical/api.ts
@@ -67,7 +67,7 @@ export const createAddress = (params: any) => {
return http.post('/v1/address/create', params)
}
-export const getAddressList = (params: any) => {
+export const getAddressList = (params?: any) => {
return http.get('/v1/address/list', params)
}
diff --git a/src/pages/physical/components/address-item.vue b/src/pages/physical/components/address-item.vue
index 6635550..2683bea 100644
--- a/src/pages/physical/components/address-item.vue
+++ b/src/pages/physical/components/address-item.vue
@@ -1,28 +1,33 @@
-
-
- {{ detail.contact_name }}
-
- {{ detail.contact_phone }}
-
+
+
+
-
- {{ detail.address_detail }}
-
-
-
-
-
- {{ detail.is_default === 1 ? '已默认' : '设为默认' }}
+
+
+ {{ detail.contact_name }}
+
+ {{ detail.contact_phone }}
- 删除
+
+ {{ detail.address_detail }}
+
+
+
+
+
+ {{ detail.is_default === 1 ? '已默认' : '设为默认' }}
+
+
+ 删除
+
@@ -35,7 +40,8 @@ const props = defineProps({
default: () => ({}),
},
})
-const emits = defineEmits(['del-event', 'update-event'])
+const emits = defineEmits(['del-event', 'update-event', 'check-event'])
+const value = ref(false)
function goDel(e) {
if (e.stopPropagation) {
@@ -52,12 +58,21 @@ function goUpdate(e) {
}
emits('update-event', props.detail)
}
+
+function handleChange(e) {
+ const { value } = e
+ if (e.stopPropagation) {
+ // W3C阻止冒泡方法
+ e.stopPropagation()
+ }
+ emits('check-event', value ? props.detail.id : '')
+}
diff --git a/src/pages/physical/index.vue b/src/pages/physical/index.vue
index 2d3cdf6..79693b6 100644
--- a/src/pages/physical/index.vue
+++ b/src/pages/physical/index.vue
@@ -477,7 +477,7 @@ export default {
data: {
message: 'success',
type: 'coupon',
- url: '/pages/jlgh/coupon',
+ url: '/pages/physical/coupon',
},
},
'*',
@@ -501,7 +501,7 @@ export default {
data: {
message: 'success',
type: 'coupon',
- url: '/pages/jlgh/redeem',
+ url: '/pages/physical/redeem',
query: {
item: encodeURIComponent(JSON.stringify(dataObj)),
},
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index b3db2db..d890c9b 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -4,12 +4,10 @@
// Generated by vite-plugin-uni-pages
interface NavigateToOptions {
-<<<<<<< HEAD
url: "/pages/physical/address" |
- "/pages/physical/createAddress";
-=======
- url: "/pages/gzyd/index";
->>>>>>> 964dde74b2f18de014a39db01294f7e0d62fd7cc
+ "/pages/physical/coupon" |
+ "/pages/physical/createAddress" |
+ "/pages/physical/redeem";
}
interface RedirectToOptions extends NavigateToOptions {}