Skip to content

Commit 79582ea

Browse files
committed
(vk)更新三维识别样式
1 parent 2c4070d commit 79582ea

File tree

4 files changed

+34
-12
lines changed

4 files changed

+34
-12
lines changed

cloudfunctions/ARDemo/proto/mmbizwxaintparDemo.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,5 @@ message GetARModelResp
111111
optional string host = 3;
112112
optional string errMsg = 4;
113113
optional uint32 expire_time = 5;
114-
optional uint32 status = 6; // 0 生成中 1 生成成功 2 生成失败 3 过期
114+
optional uint32 status = 6; // 0 生成中 1 生成成功 2 过期 3 生成失败
115115
}

miniprogram/packageAPI/pages/ar/3dmarker-ar/Components/arModelComponent.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ Component({
177177
if (!matched) {
178178
console.log("缓存对cosid进行push")
179179
console.log("当前生成模型的cosid为:", returnCosid)
180+
181+
console.log()
180182
modelInfos.push({
181183
cosid: resp.result.respBody.cosid,
182184
uploadTime: this.convertToTime(Date.parse(new Date()) / 1000),
@@ -326,10 +328,8 @@ Component({
326328

327329
modelInfoNew.statusMsg = '生成失败';
328330
if (errMsg) {
329-
modelInfoNew.statusMsg = errMsg;
330-
331+
modelInfoNew.errMsg = errMsg;
331332
}
332-
modelInfoNew.statusMsg = errMsg;
333333
}
334334

335335

miniprogram/packageAPI/pages/ar/3dmarker-ar/Components/arModelComponent.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<view class="wrap-right">
1515
<view class="model-item" wx:for="{{models}}" wx:key="modelIndex" wx:for-item="modelItem">
1616
<view
17-
class="model-info {{modelItem.modelStatus === 0 ? 'loading': ''}} {{modelItem.modelStatus === 1 ? 'done': '' }} {{modelItem.modelStatus === 2 || modelItem.modelStatus === 3 ? 'error': '' }} {{targetCosId != null && modelItem.cosid == targetCosId ? 'choosed' : '' }}"
17+
class="model-info {{modelItem.modelStatus === 0 ? 'loading': ''}} {{modelItem.modelStatus === 1 ? 'done': '' }} {{modelItem.modelStatus === 2 ? 'expired': '' }} {{modelItem.modelStatus === 3 ? 'error': '' }} {{targetCosId != null && modelItem.cosid == targetCosId ? 'choosed' : '' }}"
1818
bindtap="chooseARModel"
1919
data-cosid="{{modelItem.cosid}}"
2020
>

miniprogram/packageAPI/pages/ar/3dmarker-ar/Components/arModelComponent.wxss

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
left: 40rpx;
88
top: 30rpx;
99
width: 200rpx;
10-
height: 248rpx;
10+
height: 268rpx;
1111
}
1212

1313
button.btn-left {
@@ -36,7 +36,7 @@ button.btn-left .info-wrap {
3636
}
3737
.info-wrap p:first-child {
3838
font-size: 36rpx;
39-
line-height: 46rpx;
39+
line-height: 60rpx;
4040
}
4141

4242
button.btn-left .cross-v {
@@ -75,7 +75,7 @@ button.btn-left .cross-h {
7575
display: inline-block;
7676
margin: 10rpx 10rpx 0 10rpx;
7777
width: 206rpx;
78-
height: 260rpx;
78+
height: 280rpx;
7979
border-radius: 20rpx;
8080
}
8181
.model-item:first-child {
@@ -101,9 +101,13 @@ button.btn-left .cross-h {
101101
background-color: #2B3467;
102102
border: 8rpx #2B3467 solid;
103103
}
104+
.model-info.expired {
105+
background-color: #ed6c10;
106+
border: 8rpx #ed6c10 solid;
107+
}
104108
.model-info.error {
105-
background-color: #FF6969;
106-
border: 8rpx #FF6969 solid;
109+
background-color: #f73a3a;
110+
border: 8rpx #f73a3a solid;
107111
}
108112
.model-info.choosed {
109113
border-color: #07c160;
@@ -126,15 +130,19 @@ button.btn-left .cross-h {
126130
position: absolute;
127131
left: 20rpx;
128132
right: 20rpx;
129-
bottom: 120rpx;
133+
bottom: 140rpx;
130134
height: 40rpx;
131135
line-height: 20rpx;
132136
font-size: 16rpx;
133137
text-align: center;
134-
color: #d0d0d0;
138+
color: #fff;
135139
word-break: break-all;
136140
}
137141

142+
.model-info.done .cosid {
143+
color: #d0d0d0;
144+
}
145+
138146
.model-info .timeStamp {
139147
position: absolute;
140148
left: 10rpx;
@@ -157,6 +165,20 @@ button.btn-left .cross-h {
157165
line-height: 38rpx;
158166
}
159167

168+
.model-info .errMsg {
169+
position: absolute;
170+
left: 10rpx;
171+
right: 10rpx;
172+
bottom: 76rpx;
173+
color: #fff;
174+
font-size: 16rpx;
175+
text-align: center;
176+
line-height: 26rpx;
177+
background-color: #000;
178+
padding: 6rpx;
179+
border-radius: 6rpx;
180+
}
181+
160182
.model-info .buttonDelete {
161183
position: absolute;
162184
right: -20rpx;

0 commit comments

Comments
 (0)