diff --git a/static/images/profile.jpg b/doc/profile.jpg similarity index 100% rename from static/images/profile.jpg rename to doc/profile.jpg diff --git a/manifest.json b/manifest.json index fa21255..754f768 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "CMDF", - "appid" : "__UNI__A764ECB", + "appid" : "__UNI__197A38F", "description" : "猫妈狗爸", "versionName" : "1.1.0", "versionCode" : "100", diff --git a/pages/companionPetList/companionPetList.vue b/pages/companionPetList/companionPetList.vue index 867aa68..2aff41c 100644 --- a/pages/companionPetList/companionPetList.vue +++ b/pages/companionPetList/companionPetList.vue @@ -3,7 +3,7 @@ + src="https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/petServiceOrder/SystemOrderCircle.png"/> @@ -541,11 +541,15 @@ .personal-name { color: #333; - font-size: 32rpx; + font-size: 28rpx; // line-height: 32rpx; margin-right: 10rpx; font-weight: 900; font-style: normal; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 200rpx; } .personal-star { diff --git a/pages/personalCenter/index.vue b/pages/personalCenter/index.vue index d2a7c0b..376cdcd 100644 --- a/pages/personalCenter/index.vue +++ b/pages/personalCenter/index.vue @@ -691,10 +691,10 @@ .personal-functions-content{ width: 100%; display: flex; - justify-content: space-between; + // justify-content: space-between; align-items: center; flex-wrap: wrap; - gap: 30rpx 0; + gap: 34rpx 0; .personal-function{ width: 24%; display: flex; diff --git a/pages_order/components/order/ServiceAddress.vue b/pages_order/components/order/ServiceAddress.vue index 95d4ba0..b6c289c 100644 --- a/pages_order/components/order/ServiceAddress.vue +++ b/pages_order/components/order/ServiceAddress.vue @@ -54,7 +54,6 @@ .address-content { padding: 20rpx; - background-color: #FFF9EF; border-radius: 10rpx; } diff --git a/pages_order/order/AppletComment.java b/pages_order/order/AppletComment.java deleted file mode 100644 index 6e6bedd..0000000 --- a/pages_order/order/AppletComment.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.ruoyi.model.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 用户评价对象 applet_comment - * - * @author ruoyi - * @date 2025-03-28 - */ -public class AppletComment extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 唯一标识 */ - private Long id; - - /** 评价内容 */ - @Excel(name = "评价内容") - private String comment; - - /** 满意度 */ - @Excel(name = "满意度") - private Long satisfaction; - - /** 关联评价人员ID */ - @Excel(name = "关联评价人员ID") - private Long user1Id; - - /** 关联服务人员ID */ - @Excel(name = "关联服务人员ID") - private Long user2Id; - - /** 删除标识 */ - private Integer delFlag; - - -} diff --git a/pages_order/order/orderDetail.json b/pages_order/order/orderDetail.json deleted file mode 100644 index 651410c..0000000 --- a/pages_order/order/orderDetail.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "orderId": 6278884034316288, - "payId": 6278884034316289, - "orderSn": "250418-6278884034316288", - "memberId": 211, - "totalAmount": 71.25, - "payAmount": 71.25, - "status": 4, - "aftersaleStatus": 1, - "orderItemList": [{ - "createBy": 211, - "createTime": "2025-04-18 22:26:50", - "updateBy": null, - "updateTime": null, - "id": 6278884043425792, - "orderId": 6278884034316288, - "orderServiceId": 6278884036069376, - "productId": 63, - "outProductId": "P001", - "skuId": 404, - "outSkuId": null, - "productSnapshotId": null, - "skuSnapshotId": null, - "pic": "https://catmdogf.oss-cn-shanghai.aliyuncs.com/2024/01/08ba3980c107c2472397b13ef9769257e1陪玩.png", - "productName": "专业遛狗", - "salePrice": 75.00, - "purchasePrice": null, - "quantity": 1, - "productCategoryId": 76, - "spData": "{\"时间\":\"60\"}" - }], - "orderServiceList": [{ - "createBy": 211, - "createTime": "2025-04-18 22:26:50", - "updateBy": null, - "updateTime": null, - "id": 6278884036069376, - "orderId": 6278884034316288, - "pet": null, - "serviceFrequency": null, - "serviceDate": "2025-04-30", - "serviceTimeFirst": null, - "serviceTimeSecond": null, - "delFlag": 0, - "petId": 177, - "expectServiceTime": "MORNING", - "feedCount": null, - "petVo": { - "createBy": null, - "createTime": null, - "updateBy": null, - "updateTime": null, - "id": 177, - "name": "1", - "petType": "cat", - "gender": "男生", - "birthDate": "2025-04", - "remark": "", - "photo": "https://cdn.catmdogd.com/2025/04/188453a042e71a4617b02121d1d9a580c7t92DaD6zscoI266f52064207b09da62f45b9b38e5bf3.png", - "breed": "重点色短毛猫", - "bodyType": "小型（<10 KG）", - "personality": ["友善热情", "粘人乖巧"], - "vaccineStatus": "每年都免疫", - "sterilization": "已绝育", - "dewormingStatus": "未驱虫", - "doglicenseStatus": "", - "healthStatus": ["身体健康，无异常"], - "owner": "211" - }, - "pets": null - }], - "service": null, - "note": null, - "deliverySn": null, - "createTime": "2025-04-18 22:26:49", - "paymentTime": null, - "receiverName": "1", - "receiverPhone": "13055015802", - "receiverProvince": "", - "receiverCity": "湖南省湘潭市雨湖区雨湖路272号湘潭市雨湖区人民政府", - "receiverDistrict": "", - "receiverDetailAddress": "1", - "timeToPay": null, - "staffId": null, - "petVOList": [{ - "createBy": null, - "createTime": null, - "updateBy": null, - "updateTime": null, - "id": 177, - "name": "1", - "petType": "cat", - "gender": "男生", - "birthDate": "2025-04", - "remark": "", - "photo": "https://cdn.catmdogd.com/2025/04/188453a042e71a4617b02121d1d9a580c7t92DaD6zscoI266f52064207b09da62f45b9b38e5bf3.png", - "breed": "重点色短毛猫", - "bodyType": "小型（<10 KG）", - "personality": ["友善热情", "粘人乖巧"], - "vaccineStatus": "每年都免疫", - "sterilization": "已绝育", - "dewormingStatus": "未驱虫", - "doglicenseStatus": "", - "healthStatus": ["身体健康，无异常"], - "owner": "211" - }], - "teacherId": null, - "companionLevel": null -} \ No newline at end of file diff --git a/store/modules/user.js b/store/modules/user.js index 2e918f9..2279ea4 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -74,7 +74,8 @@ const user = { getInfo().then(res => { const user = res.user const avatar = (user == null || user.avatar == "" || user.avatar == null) ? - require("@/static/images/profile.jpg") : baseUrl + user.avatar + 'https://hly-oss-master.oss-cn-guangzhou.aliyuncs.com/pet/profile.jpg' : baseUrl + user.avatar + // require("@/static/images/profile.jpg") : baseUrl + user.avatar const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName if (res.roles && res.roles.length > 0) { diff --git a/utils/getUrl.js b/utils/getUrl.js index 4f2dcaa..86050d6 100644 --- a/utils/getUrl.js +++ b/utils/getUrl.js @@ -1,11 +1,12 @@ let current ="develop"; const accountInfo = wx.getAccountInfoSync(); -current = accountInfo.miniProgram.envVersion; +// current = accountInfo.miniProgram.envVersion; const api={ - develop:"http://h5.xzaiyp.top", + // develop:"http://h5.xzaiyp.top", + develop:"https://pet-admin.hhlm1688.com/api", // develop:"https://api-test.catmdogd.com/test-api", trial:"https://api-test.catmdogd.com/test-api", release:"https://api.catmdogd.com/prod-api",