{$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 @@
-
+
正在加载认证信息...
@@ -8,7 +8,7 @@
-
+
审核状态:{{ statusText }}
@@ -156,18 +156,51 @@
-
+
+
+
+
+ 基本资料
+ 设置头像与接单联系电话
+
+
+ 头像
+
+
+ {{ profileUploading ? '上传中...' : '更换' }}
+
+
+
+
+ 接单电话
+
+
+
+
+
+
+ 实名档案
+ 已认证
+
+ 真实姓名{{ info.master.realname }}
+ 身份证号{{ info.master.idcard_no }}
+ 服务城市{{ info.master.city || '-' }}
+ 综合评分{{ info.master.score }} 分
+ 累计完单{{ info.master.order_count }} 单
+
+
+ {{ profileSaving ? '保存中...' : '保存资料' }}
+
+
+
+
-
+
- {{ info.master.verify_status === 'pass' ? '已实名' : '审核中' }}
+ 审核中
@@ -176,37 +209,11 @@
{{ info.master.mobile }}
-
- 真实姓名
- {{ info.master.realname }}
-
-
- 身份证号
- {{ info.master.idcard_no }}
-
-
- 服务城市
- {{ info.master.city || '-' }}
-
-
- 综合评分
- {{ info.master.score }} 分
-
-
- 累计完单
- {{ info.master.order_count }} 单
-
-
-
-
- 师傅头像{{ profileUploading ? '上传中...' : '点击更换' }}
-
-
- 接单电话
-
-
- {{ profileSaving ? '保存中...' : '保存资料' }}
-
+ 真实姓名{{ info.master.realname }}
+ 身份证号{{ info.master.idcard_no }}
+ 服务城市{{ info.master.city || '-' }}
+ 综合评分{{ info.master.score }} 分
+ 累计完单{{ info.master.order_count }} 单
进入师傅工作台
@@ -616,7 +623,24 @@