diff --git a/package_sub/pages/Shop/Cart.vue b/package_sub/pages/Shop/Cart.vue
index 50235ee..3ca6a97 100644
--- a/package_sub/pages/Shop/Cart.vue
+++ b/package_sub/pages/Shop/Cart.vue
@@ -385,13 +385,13 @@ export default {
} catch (err) {}
},
pay() {
- // if (this.pickCart.length <= 0) {
- // this.$refs.uToast.show({
- // title: "请选择下单商品",
- // type: "warning",
- // });
- // return
- // }
+ if (this.carts.length <= 0) {
+ this.$refs.uToast.show({
+ title: "请选择下单商品",
+ type: "warning",
+ });
+ return
+ }
this.$u.route({
url: '/package_sub/pages/Shop/Pay',
params: {
diff --git a/package_sub/pages/Shop/Pay.vue b/package_sub/pages/Shop/Pay.vue
index c8edf97..c11c405 100644
--- a/package_sub/pages/Shop/Pay.vue
+++ b/package_sub/pages/Shop/Pay.vue
@@ -185,7 +185,7 @@
safe-area-inset-bottom
>
-
+
+ 新建收货地址
+
@@ -267,6 +276,13 @@ export default {
}
},
async submit() {
+ if(!this.site){
+ this.$refs.uToast.show({
+ title: "请选择收货地址",
+ type: "warning",
+ });
+ return
+ }
if (!this.site.id) {
this.$refs.uToast.show({
title: "请选择收货地址",
@@ -347,6 +363,11 @@ export default {
console.error(err)
}
},
+ goAddress(){
+ uni.navigateTo({
+ url:'/package_sub/pages/UserAddress/AddUserAddress?type=car'
+ })
+ },
async refund() {
try {
uni.showModal({
@@ -378,7 +399,10 @@ export default {
}
},
created() {
- this.getSites();
+ // this.getSites();
+ },
+ onShow() {
+ this.getSites()
},
onLoad(option) {
if (option.order_id) {
diff --git a/package_sub/pages/UserAddress/AddUserAddress.vue b/package_sub/pages/UserAddress/AddUserAddress.vue
index 8cc86a5..c5c4cfa 100644
--- a/package_sub/pages/UserAddress/AddUserAddress.vue
+++ b/package_sub/pages/UserAddress/AddUserAddress.vue
@@ -80,6 +80,7 @@ export default {
address: '',
is_default: 0
},
+ type:''
};
},
methods: {
@@ -137,6 +138,7 @@ export default {
})
return
}
+ let that = this
try {
await this.$u.api.userAddressSave(this.form)
this.$refs.uToast.show({
@@ -153,6 +155,7 @@ export default {
if(option.id) {
this.getDetail(option.id)
}
+ this.type = options.type?options.type:''
}
};
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 73f3323..63b7845 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,819 +1,775 @@
-
-
-
-
-
-
-
- {{ vuex_site.name }}
-
-
-
-
- 四世同堂整合照护平台
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ vuex_site.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.text }}
-
-
-
-
-
-
-
-
-
- 热门医院
-
-
-
-
-
-
-
- {{ item.name }}
-
- {{ item.tags }}
-
- {{ item.good_at }}
-
-
-
-
-
-
-
- 陪诊团队介绍
- 让就医体验更美好
- 预约陪诊
-
-
-
-
- 142812人次
- 医院陪护累计
-
-
-
-
- 12456人次
- 居家照护累计
-
-
-
-
- 关于我们
-
-
-
-
-
-
-
-
- 资质荣誉
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ vuex_site.name }}
+
+
+
+
+ 四世同堂整合照护平台
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ vuex_site.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+ 热门医院
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ {{ item.tags }}
+
+ {{ item.good_at }}
+
+
+
+
+
+
+
+ 陪诊团队介绍
+ 让就医体验更美好
+ 预约陪诊
+
+
+
+
+ 142812人次
+ 医院陪护累计
+
+
+
+
+ 12456人次
+ 居家照护累计
+
+
+
+
+ 关于我们
+
+
+
+
+
+
+
+
+ 资质荣誉
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file