diff --git a/server/application/admin/view/master/detail.html b/server/application/admin/view/master/detail.html index 0e86b3c..608c56d 100644 --- a/server/application/admin/view/master/detail.html +++ b/server/application/admin/view/master/detail.html @@ -35,7 +35,20 @@ .md-card-header { padding: 10px 16px; background: #f8fafc; border-bottom: 1px solid #e2e8f0; display: flex; align-items: center; justify-content: space-between; } .md-card-title { font-size: 13.5px; font-weight: 700; color: #1e293b; margin: 0; display: flex; align-items: center; gap: 8px; } .md-card-title i { color: #f97316; } - .md-card-body { padding: 16px; } + .md-card-body { padding: 16px; min-width: 0; } + .md-table-scroll { max-width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } + .md-table-scroll table { min-width: 560px; } + .md-grid-list { min-width: 0; } + .md-item-v { min-width: 0; } + .master-detail-container .md-footer { display: flex; justify-content: flex-end; gap: 10px; padding: 16px 0 24px; } + @media (max-width: 900px) { + .master-detail-container > .row > .col-sm-6 { width: 100%; float: none; } + } + @media (max-width: 500px) { + .md-grid-list { grid-template-columns: 1fr !important; } + .md-grid-list .md-item { grid-column: auto !important; } + .md-kpi-grid { flex-wrap: wrap; } + } .md-grid-list { display: grid; grid-template-columns: repeat(2, 1fr); gap: 10px 18px; } .md-item { display: flex; align-items: baseline; font-size: 13px; line-height: 1.5; } @@ -48,11 +61,12 @@ .idcard-img-wrap .tag { position: absolute; bottom: 0; left: 0; right: 0; background: rgba(15, 23, 42, 0.72); color: #fff; font-size: 11px; text-align: center; padding: 2px 0; } +
- +
{$row.realname|htmlentities} @@ -163,7 +177,7 @@
{if !empty($certs)} - +
{foreach name="certs" item="ct"} @@ -183,7 +197,7 @@ {/foreach} -
证书名称证件照片有效期至状态
+
{else /}
暂未上传技能资质证书
{/if} @@ -214,7 +228,7 @@
近期工单结算分成:
{if !empty($recentSettles)} - +
{foreach name="recentSettles" item="st"} @@ -231,14 +245,14 @@ {/foreach} -
工单号订单总额抽成师傅所得状态
+
{else /}
暂无结算入账记录
{/if}
近期提现申请记录:
{if !empty($recentWithdraws)} - +
{foreach name="recentWithdraws" item="w"} @@ -256,7 +270,7 @@ {/foreach} -
申请金额手续费实到金额渠道状态
+
{else /}
暂无提现申请记录
{/if} @@ -272,7 +286,7 @@
{if !empty($recentReviews)} - +
@@ -299,7 +313,7 @@ {/foreach} -
关联工单
+
{else /}
暂无客户评价记录
{/if} @@ -313,7 +327,7 @@
{if !empty($recentOrders)} - +
@@ -340,22 +354,19 @@ {/foreach} -
工单编号
+
{else /}
暂无接单履约历史
{/if} - diff --git a/server/application/admin/view/order/detail.html b/server/application/admin/view/order/detail.html index 7fb93ca..f5ab21e 100644 --- a/server/application/admin/view/order/detail.html +++ b/server/application/admin/view/order/detail.html @@ -272,7 +272,8 @@
{if $row.master_id && $row.master}
- + +
{$row.master.realname|htmlentities} diff --git a/server/application/api/controller/Home.php b/server/application/api/controller/Home.php index 8ace492..1169a00 100644 --- a/server/application/api/controller/Home.php +++ b/server/application/api/controller/Home.php @@ -1538,6 +1538,11 @@ class Home extends Base $this->error('该晒单不存在或已取消公开'); } + // 晒单保存师傅称呼快照,头像从关联订单读取当前师傅资料。 + $caseMasterAvatar = Db::name('order')->alias('o') + ->join('master m', 'm.id = o.master_id', 'LEFT') + ->where('o.id', (int)$sc['order_id'])->value('m.avatar'); + $service = Db::name('service')->where('id', (int)$sc['service_id'])->find(); $basePrice = $service ? (float)$service['base_price'] : 0.00; @@ -1587,6 +1592,7 @@ class Home extends Base ], 'master' => [ 'realname' => (string)$sc['master_name'], + 'avatar' => \app\common\library\MasterAvatar::url($caseMasterAvatar), 'score' => (float)$sc['master_score'], ], 'review' => [ diff --git a/server/application/api/controller/Master.php b/server/application/api/controller/Master.php index d84670d..35a502f 100644 --- a/server/application/api/controller/Master.php +++ b/server/application/api/controller/Master.php @@ -263,7 +263,7 @@ class Master extends Base 'idcard_front_raw' => (string)($master['idcard_front'] ?? ''), 'idcard_back_raw' => (string)($master['idcard_back'] ?? ''), 'cert_images' => (string)($master['cert_images'] ?? ''), - 'avatar' => !empty($master['avatar']) ? (strpos((string)$master['avatar'], 'http') === 0 ? $master['avatar'] : cdnurl($master['avatar'], true)) : '', + 'avatar' => \app\common\library\MasterAvatar::url($master['avatar']), 'city' => $master['city'], 'lng' => (string)($master['lng'] ?? ''), 'lat' => (string)($master['lat'] ?? ''), diff --git a/server/application/api/controller/Order.php b/server/application/api/controller/Order.php index 4d018d1..cb024a3 100644 --- a/server/application/api/controller/Order.php +++ b/server/application/api/controller/Order.php @@ -987,7 +987,7 @@ class Order extends Base $master = [ 'id' => (int)$m['id'], 'realname' => $m['realname'], - 'avatar' => !empty($m['avatar']) ? (strpos((string)$m['avatar'], 'http') === 0 ? $m['avatar'] : cdnurl($m['avatar'], true)) : '', + 'avatar' => \app\common\library\MasterAvatar::url($m['avatar']), 'mobile' => $canSeeRealMobile ? $rawM : $maskedM, 'mobile_raw' => $masterMobileRaw, 'mobile_mask' => $maskedM, @@ -1020,7 +1020,7 @@ class Order extends Base 'id' => (int)$q['id'], 'master_id' => (int)$q['master_id'], 'realname' => $q['realname'] ?: '师傅', - 'avatar' => $q['avatar'], + 'avatar' => \app\common\library\MasterAvatar::url($q['avatar']), 'score' => (float)$q['score'], 'order_count' => (int)$q['order_count'], 'level' => (int)$q['level'], @@ -1271,7 +1271,7 @@ class Order extends Base 'id' => (int)$q['id'], 'master_id' => (int)$q['master_id'], 'realname' => $q['realname'] ?: '师傅', - 'avatar' => $q['avatar'], + 'avatar' => \app\common\library\MasterAvatar::url($q['avatar']), 'score' => (float)$q['score'], 'order_count' => (int)$q['order_count'], 'amount' => (float)$q['amount'], diff --git a/server/application/common/library/MasterAvatar.php b/server/application/common/library/MasterAvatar.php new file mode 100644 index 0000000..2abd1b9 --- /dev/null +++ b/server/application/common/library/MasterAvatar.php @@ -0,0 +1,16 @@ + '优匠优服', 'beian' => '', 'cdnurl' => '', - 'version' => '1.0.90', + 'version' => '1.0.92', 'timezone' => 'Asia/Shanghai', 'forbiddenip' => '', 'languages' => diff --git a/tests/master_avatar_url.php b/tests/master_avatar_url.php new file mode 100644 index 0000000..8b2b1d6 --- /dev/null +++ b/tests/master_avatar_url.php @@ -0,0 +1,16 @@ + '', + '/avatar/u104/photo.jpg' => 'https://cdn.example.test/avatar/u104/photo.jpg', + 'https://images.example.test/a.png' => 'https://images.example.test/a.png', + '//images.example.test/a.png' => '//images.example.test/a.png', + '/assets/img/avatar.png' => '/assets/img/avatar.png', +]; +foreach ($cases as $input => $expected) { + $actual = MasterAvatar::url($input); + if ($actual !== $expected) { fwrite(STDERR, "Avatar URL mismatch for $input\n"); exit(1); } +} +echo "Master avatar URL tests passed\n"; diff --git a/yjyf-app/components/master/MasterWorkbenchView.vue b/yjyf-app/components/master/MasterWorkbenchView.vue index 5fda5f9..289e490 100644 --- a/yjyf-app/components/master/MasterWorkbenchView.vue +++ b/yjyf-app/components/master/MasterWorkbenchView.vue @@ -51,7 +51,9 @@ - + + + {{ verifyStatusMeta.text }} @@ -756,9 +758,18 @@ position: relative; } + .avatar-clip { + width: 100%; + height: 100%; + border-radius: 50%; + overflow: hidden; + } + .avatar-img { - width: 76rpx; - height: 76rpx; + display: block; + width: 100%; + height: 100%; + border-radius: 50%; } .v-auth-badge { diff --git a/yjyf-app/pages/master/apply.vue b/yjyf-app/pages/master/apply.vue index c2fcc5f..e6286b6 100644 --- a/yjyf-app/pages/master/apply.vue +++ b/yjyf-app/pages/master/apply.vue @@ -1,6 +1,6 @@