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 ? '立即支付' : '查看订单' }}