From fb0055118b6b30ec1eb193df197d9e25408d4d36 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Thu, 6 Feb 2025 18:03:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 5 +- package_sub/pages/AddOrder/AddOrder.vue | 26 +- package_sub/pages/Shop/Navbar.vue | 18 +- package_sub/pages/Shop/ProductDetail.vue | 287 +++++ package_sub/pages/Shop/ProductList.vue | 140 +-- package_sub/pages/Shop/Tabbar.vue | 5 +- package_sub/pages/Shop/classify.data.js | 1087 ----------------- .../pages/UserAddress/AddUserAddress.vue | 218 ++++ package_sub/pages/UserAddress/UserAddress.vue | 162 +++ pages.json | 18 + pages/index/index.vue | 5 +- pages/me/me.vue | 31 +- pages/order/order.vue | 2 +- static/me/dizhi.png | Bin 0 -> 1973 bytes static/me/jujia.png | Bin 0 -> 2699 bytes static/me/lianxiren.png | Bin 0 -> 1440 bytes static/me/peizheng.png | Bin 0 -> 2772 bytes static/me/shangcheng.png | Bin 0 -> 2361 bytes static/me/shouhou.png | Bin 0 -> 1809 bytes store/index.js | 7 + 20 files changed, 818 insertions(+), 1193 deletions(-) create mode 100644 package_sub/pages/Shop/ProductDetail.vue delete mode 100644 package_sub/pages/Shop/classify.data.js create mode 100644 package_sub/pages/UserAddress/AddUserAddress.vue create mode 100644 package_sub/pages/UserAddress/UserAddress.vue create mode 100644 static/me/dizhi.png create mode 100644 static/me/jujia.png create mode 100644 static/me/lianxiren.png create mode 100644 static/me/peizheng.png create mode 100644 static/me/shangcheng.png create mode 100644 static/me/shouhou.png diff --git a/manifest.json b/manifest.json index cbd1c15..3619073 100644 --- a/manifest.json +++ b/manifest.json @@ -58,9 +58,12 @@ "permission" : { "scope.userLocation" : { "desc" : "需要获取您的定位" + }, + "scope.chooseAddress": { + "desc" : "需要获取您的收获地址" } }, - "requiredPrivateInfos" : [ "getLocation" ], + "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ], "optimization" : { "subPackages" : true }, diff --git a/package_sub/pages/AddOrder/AddOrder.vue b/package_sub/pages/AddOrder/AddOrder.vue index a085dfa..7324330 100644 --- a/package_sub/pages/AddOrder/AddOrder.vue +++ b/package_sub/pages/AddOrder/AddOrder.vue @@ -106,19 +106,19 @@ @click="orderId ? false : (isShowHospital = true)" /> - + - + - + { + if (this.form.type == 2) { + return true + } else { + return !!value + } + }, message: "请选择就诊医院", trigger: ["blur", "change"], }, @@ -725,7 +730,10 @@ export default { }, onLoad(option) { this.form.accompany_product_id = option.id ? Number(option.id) : ""; - this.form.type = option.type; + this.form.type = Number(option.type); + uni.setNavigationBarTitle({ + title: option.type == 1 ? '预约陪诊' : '预约居家照护' + }) this.getList(option.type); this.getHospital(option.site_id); this.getUserArchive(); diff --git a/package_sub/pages/Shop/Navbar.vue b/package_sub/pages/Shop/Navbar.vue index 2322bc5..dbf5509 100644 --- a/package_sub/pages/Shop/Navbar.vue +++ b/package_sub/pages/Shop/Navbar.vue @@ -7,10 +7,12 @@ :back-text-style="{ color: '#fff' }" + title-color="#fff" :background="{ backgroundImage: 'linear-gradient(0deg, #c10d12 0%, #c10d12 4%, #e26165 99%, #e26165 100%)' - }"> - + }" + :custom-back="back"> + @@ -21,7 +23,11 @@ + + + diff --git a/package_sub/pages/Shop/ProductList.vue b/package_sub/pages/Shop/ProductList.vue index acf295e..60c6097 100644 --- a/package_sub/pages/Shop/ProductList.vue +++ b/package_sub/pages/Shop/ProductList.vue @@ -4,20 +4,25 @@ - {{item.name}} - + - + - {{item.name}} + {{key}} - - + + {{item1.name}} @@ -29,11 +34,13 @@ diff --git a/package_sub/pages/Shop/Tabbar.vue b/package_sub/pages/Shop/Tabbar.vue index c588873..8d94693 100644 --- a/package_sub/pages/Shop/Tabbar.vue +++ b/package_sub/pages/Shop/Tabbar.vue @@ -50,9 +50,12 @@ export default { }, methods: { tabbarSwitch(e) { + let curPages = getCurrentPages(); + if (('/' + curPages[curPages.length - 1].route) === this.list[e].pagePath) return this.$u.route({ url: this.list[e].pagePath, - animationDuration: 500 + animationDuration: 500, + type: 'reLaunch' }) } }, diff --git a/package_sub/pages/Shop/classify.data.js b/package_sub/pages/Shop/classify.data.js deleted file mode 100644 index cb4f75a..0000000 --- a/package_sub/pages/Shop/classify.data.js +++ /dev/null @@ -1,1087 +0,0 @@ -export default[ - { - "name": "女装", - "foods": [ - { - "name": "A字裙", - "key": "A字裙", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg", - "cat": 10 - }, - { - "name": "T恤", - "key": "T恤", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/2.jpg", - "cat": 10 - }, - { - "name": "半身裙", - "key": "半身裙", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/3.jpg", - "cat": 10 - }, - { - "name": "衬衫", - "key": "衬衫", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/4.jpg", - "cat": 10 - }, - { - "name": "短裙", - "key": "短裙", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg", - "cat": 10 - }, - { - "name": "阔腿裤", - "key": "阔腿裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/6.jpg", - "cat": 10 - }, - { - "name": "连衣裙", - "key": "连衣裙", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/7.jpg", - "cat": 10 - }, - { - "name": "妈妈装", - "key": "妈妈装", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg", - "cat": 10 - }, - { - "name": "牛仔裤", - "key": "牛仔裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg", - "cat": 10 - }, - { - "name": "情侣装", - "key": "情侣装", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/10.jpg", - "cat": 10 - }, - { - "name": "休闲裤", - "key": "休闲裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/11.jpg", - "cat": 10 - }, - { - "name": "雪纺衫", - "key": "雪纺衫", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/12.jpg", - "cat": 10 - }, - { - "name": "防晒衣", - "key": "防晒衣", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/13.jpg", - "cat": 10 - }, - { - "name": "礼服/婚纱", - "key": "礼服婚纱", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/14.jpg", - "cat": 10 - } - ] - }, - { - "name": "美食", - "foods": [ - { - "name": "火锅", - "key": "火锅", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/1.jpg", - "cat": 6 - }, - { - "name": "糕点饼干", - "key": "糕点饼干", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/2.jpg", - "cat": 6 - }, - { - "name": "坚果果干", - "key": "坚果果干", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/3.jpg", - "cat": 6 - }, - { - "name": "酒类", - "key": "酒类", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/4.jpg", - "cat": 6 - }, - { - "name": "辣条", - "key": "辣条", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/5.jpg", - "cat": 6 - }, - { - "name": "大礼包", - "key": "大礼包", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/6.jpg", - "cat": 6 - }, - { - "name": "精品茗茶", - "key": "茶", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/7.jpg", - "cat": 6 - }, - { - "name": "休闲食品", - "key": "休闲食品", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/8.jpg", - "cat": 6 - }, - { - "name": "糖果巧克力", - "key": "糖果巧克力", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/9.jpg", - "cat": 6 - }, - { - "name": "方便速食", - "key": "方便速食", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/10.jpg", - "cat": 6 - }, - { - "name": "营养代餐", - "key": "营养代餐", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/11.jpg", - "cat": 6 - }, - { - "name": "粮油副食", - "key": "粮油", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/12.jpg", - "cat": 6 - }, - { - "name": "生鲜水果", - "key": "水果", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/13.jpg", - "cat": 6 - }, - { - "name": "饮品", - "key": "饮品", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/14.jpg", - "cat": 6 - } - ] - }, - { - "name": "美妆", - "foods": [ - { - "name": "化妆刷", - "key": "化妆刷", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/1.jpg", - "cat": 3 - }, - { - "name": "粉底", - "key": "粉底", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/2.jpg", - "cat": 3 - }, - { - "name": "洗发护发", - "key": "洗发护发", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/3.jpg", - "cat": 3 - }, - { - "name": "美容工具", - "key": "美容工具", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/4.jpg", - "cat": 3 - }, - { - "name": "眼部护理", - "key": "眼部护理", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/5.jpg", - "cat": 3 - }, - { - "name": "眉妆", - "key": "眉妆", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/6.jpg", - "cat": 3 - }, - { - "name": "卸妆品", - "key": "卸妆品", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/7.jpg", - "cat": 3 - }, - { - "name": "基础护肤", - "key": "基础护肤", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/8.jpg", - "cat": 3 - }, - { - "name": "眼妆", - "key": "眼妆", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/9.jpg", - "cat": 3 - }, - { - "name": "唇妆", - "key": "唇妆", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/10.jpg", - "cat": 3 - }, - { - "name": "面膜", - "key": "面膜", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/11.jpg", - "cat": 3 - }, - { - "name": "沐浴用品", - "key": "沐浴用品", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/12.jpg", - "cat": 3 - }, - { - "name": "护肤套装", - "key": "护肤套装", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/13.jpg", - "cat": 3 - }, - { - "name": "防晒品", - "key": "防晒品", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/14.jpg", - "cat": 3 - }, - { - "name": "美甲", - "key": "美甲", - "icon": "https://cdn.uviewui.com/uview/common/classify/3/15.jpg", - "cat": 3 - } - - ] - }, - { - "name": "居家日用", - "foods": [ - { - "name": "垃圾袋", - "key": "垃圾袋", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/1.jpg", - "cat": 4 - }, - { - "name": "纸巾", - "key": "纸巾", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/2.jpg", - "cat": 4 - }, - { - "name": "驱蚊用品", - "key": "驱蚊用品", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/3.jpg", - "cat": 4 - }, - { - "name": "收纳神器", - "key": "收纳神器", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/4.jpg", - "cat": 4 - }, - { - "name": "厨房用品", - "key": "厨房用品", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/5.jpg", - "cat": 4 - }, - { - "name": "厨房烹饪", - "key": "烹饪", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/6.jpg", - "cat": 4 - }, - { - "name": "衣物晾晒", - "key": "衣物晾晒", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/7.jpg", - "cat": 4 - }, - { - "name": "衣物护理", - "key": "衣物护理", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/8.jpg", - "cat": 4 - }, - { - "name": "宠物用品", - "key": "宠物用品", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/9.jpg", - "cat": 4 - }, - { - "name": "医药保健", - "key": "医药", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/10.jpg", - "cat": 4 - }, - { - "name": "日用百货", - "key": "百货", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/11.jpg", - "cat": 4 - }, - { - "name": "清洁用品", - "key": "清洁", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/12.jpg", - "cat": 4 - }, - { - "name": "绿植园艺", - "key": "绿植", - "icon": "https://cdn.uviewui.com/uview/common/classify/4/13.jpg", - "cat": 4 - } - ] - }, - { - "name": "男装", - "foods": [ - { - "name": "爸爸装", - "key": "爸爸装", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/1.jpg", - "cat": 12 - }, - { - "name": "牛仔裤", - "key": "牛仔裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/2.jpg", - "cat": 12 - }, - { - "name": "衬衫", - "key": "衬衫", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/3.jpg", - "cat": 12 - }, - { - "name": "休闲裤", - "key": "休闲裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/4.jpg", - "cat": 12 - }, - { - "name": "外套", - "key": "外套", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/5.jpg", - "cat": 12 - }, - { - "name": "T恤", - "key": "T恤", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/6.jpg", - "cat": 12 - }, - { - "name": "套装", - "key": "套装", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/7.jpg", - "cat": 12 - }, - { - "name": "运动裤", - "key": "运动裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/8.jpg", - "cat": 12 - }, - { - "name": "马甲/背心", - "key": "马甲背心", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/9.jpg", - "cat": 12 - }, - { - "name": "POLO衫", - "key": "POLO衫", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/10.jpg", - "cat": 12 - }, - { - "name": "商务装", - "key": "商务装", - "icon": "https://cdn.uviewui.com/uview/common/classify/5/11.jpg", - "cat": 12 - } - ] - }, - { - "name": "鞋品", - "foods": [ - { - "name": "单鞋", - "key": "单鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/1.jpg", - "cat": 5 - }, - { - "name": "皮鞋", - "key": "皮鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/2.jpg", - "cat": 5 - }, - { - "name": "帆布鞋", - "key": "帆布鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/3.jpg", - "cat": 5 - }, - { - "name": "北京老布鞋", - "key": "北京老布鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/4.jpg", - "cat": 5 - }, - { - "name": "运动鞋", - "key": "运动鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/5.jpg", - "cat": 5 - }, - { - "name": "拖鞋", - "key": "拖鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/6.jpg", - "cat": 5 - }, - { - "name": "凉鞋", - "key": "凉鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/7.jpg", - "cat": 5 - }, - { - "name": "休闲鞋", - "key": "休闲鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/8.jpg", - "cat": 5 - }, - { - "name": "高跟鞋", - "key": "高跟鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/9.jpg", - "cat": 5 - }, - { - "name": "老人鞋", - "key": "老人鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/10.jpg", - "cat": 5 - }, - { - "name": "懒人鞋", - "key": "懒人鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/6/11.jpg", - "cat": 5 - } - ] - }, - { - "name": "数码家电", - "foods": [ - { - "name": "数据线", - "key": "数据线", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/1.jpg", - "cat": 8 - }, - { - "name": "耳机", - "key": "耳机", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/2.jpg", - "cat": 8 - }, - { - "name": "生活家电", - "key": "家电", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/3.jpg", - "cat": 8 - }, - { - "name": "电风扇", - "key": "电风扇", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/4.jpg", - "cat": 8 - }, - { - "name": "电吹风", - "key": "电吹风", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/5.jpg", - "cat": 8 - }, - { - "name": "手机壳", - "key": "手机壳", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/6.jpg", - "cat": 8 - }, - { - "name": "榨汁机", - "key": "榨汁机", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/7.jpg", - "cat": 8 - }, - { - "name": "小家电", - "key": "小家电", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/8.jpg", - "cat": 8 - }, - { - "name": "数码电子", - "key": "数码", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/9.jpg", - "cat": 8 - }, - { - "name": "电饭锅", - "key": "电饭锅", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/10.jpg", - "cat": 8 - }, - { - "name": "手机支架", - "key": "手机支架", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/11.jpg", - "cat": 8 - }, - { - "name": "剃须刀", - "key": "剃须刀", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/12.jpg", - "cat": 8 - }, - { - "name": "充电宝", - "key": "充电宝", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/13.jpg", - "cat": 8 - }, - { - "name": "手机配件", - "key": "手机配件", - "icon": "https://cdn.uviewui.com/uview/common/classify/7/14.jpg", - "cat": 8 - } - ] - }, - { - "name": "母婴", - "foods": [ - { - "name": "婴童服饰", - "key": "衣服", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/1.jpg", - "cat": 2 - }, - { - "name": "玩具乐器", - "key": "玩具乐器", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/2.jpg", - "cat": 2 - }, - { - "name": "尿不湿", - "key": "尿不湿", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/3.jpg", - "cat": 2 - }, - { - "name": "安抚牙胶", - "key": "安抚牙胶", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/4.jpg", - "cat": 2 - }, - { - "name": "奶瓶奶嘴", - "key": "奶瓶奶嘴", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/5.jpg", - "cat": 2 - }, - { - "name": "孕妈用品", - "key": "孕妈用品", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/6.jpg", - "cat": 2 - }, - { - "name": "宝宝用品", - "key": "宝宝用品", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/7.jpg", - "cat": 2 - }, - { - "name": "婴童湿巾", - "key": "湿巾", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/8.jpg", - "cat": 2 - }, - { - "name": "喂养洗护", - "key": "洗护", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/9.jpg", - "cat": 2 - }, - { - "name": "婴童鞋靴", - "key": "童鞋", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/10.jpg", - "cat": 2 - }, - { - "name": "口水巾", - "key": "口水巾", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/11.jpg", - "cat": 2 - }, - { - "name": "营养辅食", - "key": "营养", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/12.jpg", - "cat": 2 - }, - { - "name": "婴幼书籍", - "key": "书籍", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/13.jpg", - "cat": 2 - }, - { - "name": "婴儿车", - "key": "婴儿车", - "icon": "https://cdn.uviewui.com/uview/common/classify/8/14.jpg", - "cat": 2 - } - ] - }, - { - "name": "箱包", - "foods": [ - { - "name": "单肩包", - "key": "单肩包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/1.jpg", - "cat": 0 - }, - { - "name": "斜挎包", - "key": "斜挎包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/2.jpg", - "cat": 0 - }, - { - "name": "女包", - "key": "女包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/3.jpg", - "cat": 0 - }, - { - "name": "男包", - "key": "男包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/4.jpg", - "cat": 0 - }, - { - "name": "双肩包", - "key": "双肩包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/5.jpg", - "cat": 0 - }, - { - "name": "小方包", - "key": "小方包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/6.jpg", - "cat": 0 - }, - { - "name": "钱包", - "key": "钱包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/7.jpg", - "cat": 0 - }, - { - "name": "旅行箱包", - "key": "旅行箱包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/8.jpg", - "cat": 0 - }, - { - "name": "零钱包", - "key": "零钱包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/9.jpg", - "cat": 0 - }, - { - "name": "手提包", - "key": "手提包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/10.jpg", - "cat": 0 - }, - { - "name": "胸包", - "key": "胸包", - "icon": "https://cdn.uviewui.com/uview/common/classify/9/11.jpg", - "cat": 0 - } - ] - }, - { - "name": "内衣", - "foods": [ - { - "name": "袜子", - "key": "袜子", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/1.jpg", - "cat": 11 - }, - { - "name": "吊带背心", - "key": "吊带背心", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/2.jpg", - "cat": 11 - }, - { - "name": "抹胸", - "key": "抹胸", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/3.jpg", - "cat": 11 - }, - { - "name": "内裤", - "key": "内裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/4.jpg", - "cat": 11 - }, - { - "name": "文胸", - "key": "文胸", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/5.jpg", - "cat": 11 - }, - { - "name": "文胸套装", - "key": "文胸套装", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/6.jpg", - "cat": 11 - }, - { - "name": "打底塑身", - "key": "打底塑身", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/7.jpg", - "cat": 11 - }, - { - "name": "家居服", - "key": "家居服", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/8.jpg", - "cat": 11 - }, - { - "name": "船袜", - "key": "船袜", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/9.jpg", - "cat": 11 - }, - { - "name": "情侣睡衣", - "key": "情侣睡衣", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/10.jpg", - "cat": 11 - }, - { - "name": "丝袜", - "key": "丝袜", - "icon": "https://cdn.uviewui.com/uview/common/classify/10/11.jpg", - "cat": 11 - } - ] - }, - { - "name": "文娱车品", - "foods": [ - { - "name": "车市车品", - "key": "车市车品", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/1.jpg", - "cat": 7 - }, - { - "name": "办公文具", - "key": "办公文具", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/2.jpg", - "cat": 7 - }, - { - "name": "考试必备", - "key": "考试必备", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/3.jpg", - "cat": 7 - }, - { - "name": "笔记本", - "key": "笔记本", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/4.jpg", - "cat": 7 - }, - { - "name": "艺术礼品", - "key": "礼品", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/5.jpg", - "cat": 7 - }, - { - "name": "书写工具", - "key": "书写工具", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/6.jpg", - "cat": 7 - }, - { - "name": "车载电器", - "key": "车载电器", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/7.jpg", - "cat": 7 - }, - { - "name": "图书音像", - "key": "图书音像", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/8.jpg", - "cat": 7 - }, - { - "name": "画具画材", - "key": "画具画材", - "icon": "https://cdn.uviewui.com/uview/common/classify/11/9.jpg", - "cat": 7 - } - ] - }, - { - "name": "配饰", - "foods": [ - { - "name": "太阳镜", - "key": "太阳镜", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/1.jpg", - "cat": 0 - }, - { - "name": "皮带", - "key": "皮带", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/2.jpg", - "cat": 0 - }, - { - "name": "棒球帽", - "key": "棒球帽", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/3.jpg", - "cat": 0 - }, - { - "name": "手表", - "key": "手表", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/4.jpg", - "cat": 0 - }, - { - "name": "发饰", - "key": "发饰", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/5.jpg", - "cat": 0 - }, - { - "name": "项链", - "key": "项链", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/6.jpg", - "cat": 0 - }, - { - "name": "手饰", - "key": "手饰", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/7.jpg", - "cat": 0 - }, - { - "name": "耳环", - "key": "耳环", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/8.jpg", - "cat": 0 - }, - { - "name": "帽子丝巾", - "key": "帽子丝巾", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/9.jpg", - "cat": 0 - }, - { - "name": "眼镜墨镜", - "key": "眼镜墨镜", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/10.jpg", - "cat": 0 - }, - { - "name": "发带发箍", - "key": "发带发箍", - "icon": "https://cdn.uviewui.com/uview/common/classify/12/11.jpg", - "cat": 0 - } - ] - }, - { - "name": "家装家纺", - "foods": [ - { - "name": "家居饰品", - "key": "家居饰品", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/1.jpg", - "cat": 0 - }, - { - "name": "凉席", - "key": "凉席", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/2.jpg", - "cat": 0 - }, - { - "name": "背枕靠枕", - "key": "靠枕", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/3.jpg", - "cat": 0 - }, - { - "name": "床上用品", - "key": "床上用品", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/4.jpg", - "cat": 0 - }, - { - "name": "摆件", - "key": "摆件", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/5.jpg", - "cat": 0 - }, - { - "name": "四件套", - "key": "四件套", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/6.jpg", - "cat": 0 - }, - { - "name": "装饰品", - "key": "装饰品", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/7.jpg", - "cat": 0 - }, - { - "name": "卫浴用品", - "key": "卫浴", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/8.jpg", - "cat": 0 - }, - { - "name": "家居家装", - "key": "家具", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/9.jpg", - "cat": 0 - }, - { - "name": "蚊帐", - "key": "蚊帐", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/10.jpg", - "cat": 0 - }, - { - "name": "墙纸贴纸", - "key": "墙纸", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/11.jpg", - "cat": 0 - }, - { - "name": "空调被", - "key": "空调被", - "icon": "https://cdn.uviewui.com/uview/common/classify/13/12.jpg", - "cat": 0 - } - ] - }, - { - "name": "户外运动", - "foods": [ - { - "name": "游泳装备", - "key": "游泳", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/1.jpg", - "cat": 0 - }, - { - "name": "泳镜", - "key": "泳镜", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/2.jpg", - "cat": 0 - }, - { - "name": "户外装备", - "key": "户外", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/3.jpg", - "cat": 0 - }, - { - "name": "健身服饰", - "key": "健身", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/4.jpg", - "cat": 0 - }, - { - "name": "泳衣", - "key": "泳衣", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/5.jpg", - "cat": 0 - }, - { - "name": "瑜伽垫", - "key": "瑜伽垫", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/6.jpg", - "cat": 0 - }, - { - "name": "瑜伽用品", - "key": "瑜伽", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/7.jpg", - "cat": 0 - }, - { - "name": "健身装备", - "key": "健身", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/8.jpg", - "cat": 0 - }, - { - "name": "球迷用品", - "key": "球迷", - "icon": "https://cdn.uviewui.com/uview/common/classify/14/9.jpg", - "cat": 0 - } - ] - } -] \ No newline at end of file diff --git a/package_sub/pages/UserAddress/AddUserAddress.vue b/package_sub/pages/UserAddress/AddUserAddress.vue new file mode 100644 index 0000000..88d9292 --- /dev/null +++ b/package_sub/pages/UserAddress/AddUserAddress.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/package_sub/pages/UserAddress/UserAddress.vue b/package_sub/pages/UserAddress/UserAddress.vue new file mode 100644 index 0000000..48631c0 --- /dev/null +++ b/package_sub/pages/UserAddress/UserAddress.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/pages.json b/pages.json index bb0591b..b81790e 100644 --- a/pages.json +++ b/pages.json @@ -101,6 +101,24 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/UserAddress/UserAddress", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/UserAddress/AddUserAddress", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/Shop/ProductDetail", + "style": { + "navigationStyle": "custom" + } } ] } diff --git a/pages/index/index.vue b/pages/index/index.vue index b2f5e46..01b3e10 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -116,9 +116,8 @@ {{ item.name }} - - {{ item.good_at }} - 综合医院 + + {{ item.tags }} {{ item.good_at }} diff --git a/pages/me/me.vue b/pages/me/me.vue index d7bc03d..18d8c3d 100644 --- a/pages/me/me.vue +++ b/pages/me/me.vue @@ -40,11 +40,11 @@ type: 1 } })"> - + 陪诊订单 - + 商城订单 - + 居家照护订单 + + + 收货地址 + - + 常用联系人 - + 售后订单 @@ -223,21 +230,25 @@ export default { padding: 4vh 25rpx 0; .avatar { - width: 80rpx; - height: 80rpx; + width: 112rpx; + height: 112rpx; border-radius: 100%; background: #fff; - padding: 20rpx; - object-fit: cover; + border: 6rpx #fff solid; filter: drop-shadow(4rpx 6rpx 10rpx #ba534c); } .info { + color: #333; padding-left: 40rpx; &-name { - line-height: 2; + font-size: 28rpx; font-weight: 600; } + &-mobile { + font-size: 24rpx; + padding-top: 18rpx; + } } } diff --git a/pages/order/order.vue b/pages/order/order.vue index cb37949..abfb68c 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -97,7 +97,7 @@ params: { order_id: i.id, type: i.type, - site_id: i.hospital.site_id + site_id: i.hospital ? i.hospital.site_id : '' } })" >{{ i.pay_status === 0 ? '立即支付' : '查看订单' }}_&Rn+jW0F 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 FV1flN`vCv| literal 0 HcmV?d00001 diff --git a/static/me/lianxiren.png b/static/me/lianxiren.png new file mode 100644 index 0000000000000000000000000000000000000000..68f89a2e79ffbe60c7d0230503f505a2bbd815ea GIT binary patch literal 1440 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