File tree Expand file tree Collapse file tree 4 files changed +34
-12
lines changed
cloudfunctions/ARDemo/proto
miniprogram/packageAPI/pages/ar/3dmarker-ar/Components Expand file tree Collapse file tree 4 files changed +34
-12
lines changed Original file line number Diff line number Diff line change @@ -111,5 +111,5 @@ message GetARModelResp
111
111
optional string host = 3 ;
112
112
optional string errMsg = 4 ;
113
113
optional uint32 expire_time = 5 ;
114
- optional uint32 status = 6 ; // 0 生成中 1 生成成功 2 生成失败 3 过期
114
+ optional uint32 status = 6 ; // 0 生成中 1 生成成功 2 过期 3 生成失败
115
115
}
Original file line number Diff line number Diff line change @@ -177,6 +177,8 @@ Component({
177
177
if ( ! matched ) {
178
178
console . log ( "缓存对cosid进行push" )
179
179
console . log ( "当前生成模型的cosid为:" , returnCosid )
180
+
181
+ console . log ( )
180
182
modelInfos . push ( {
181
183
cosid : resp . result . respBody . cosid ,
182
184
uploadTime : this . convertToTime ( Date . parse ( new Date ( ) ) / 1000 ) ,
@@ -326,10 +328,8 @@ Component({
326
328
327
329
modelInfoNew . statusMsg = '生成失败' ;
328
330
if ( errMsg ) {
329
- modelInfoNew . statusMsg = errMsg ;
330
-
331
+ modelInfoNew . errMsg = errMsg ;
331
332
}
332
- modelInfoNew . statusMsg = errMsg ;
333
333
}
334
334
335
335
Original file line number Diff line number Diff line change 14
14
<view class="wrap-right">
15
15
<view class="model-item" wx:for="{{models}}" wx:key="modelIndex" wx:for-item="modelItem">
16
16
<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' : '' }}"
18
18
bindtap="chooseARModel"
19
19
data-cosid="{{modelItem.cosid}}"
20
20
>
Original file line number Diff line number Diff line change 7
7
left: 40rpx;
8
8
top: 30rpx;
9
9
width: 200rpx;
10
- height: 248rpx ;
10
+ height: 268rpx ;
11
11
}
12
12
13
13
button.btn-left {
@@ -36,7 +36,7 @@ button.btn-left .info-wrap {
36
36
}
37
37
.info-wrap p:first-child {
38
38
font-size: 36rpx;
39
- line-height: 46rpx ;
39
+ line-height: 60rpx ;
40
40
}
41
41
42
42
button.btn-left .cross-v {
@@ -75,7 +75,7 @@ button.btn-left .cross-h {
75
75
display: inline-block;
76
76
margin: 10rpx 10rpx 0 10rpx;
77
77
width: 206rpx;
78
- height: 260rpx ;
78
+ height: 280rpx ;
79
79
border-radius: 20rpx;
80
80
}
81
81
.model-item:first-child {
@@ -101,9 +101,13 @@ button.btn-left .cross-h {
101
101
background-color: #2B3467;
102
102
border: 8rpx #2B3467 solid;
103
103
}
104
+ .model-info.expired {
105
+ background-color: #ed6c10;
106
+ border: 8rpx #ed6c10 solid;
107
+ }
104
108
.model-info.error {
105
- background-color: #FF6969 ;
106
- border: 8rpx #FF6969 solid;
109
+ background-color: #f73a3a ;
110
+ border: 8rpx #f73a3a solid;
107
111
}
108
112
.model-info.choosed {
109
113
border-color: #07c160;
@@ -126,15 +130,19 @@ button.btn-left .cross-h {
126
130
position: absolute;
127
131
left: 20rpx;
128
132
right: 20rpx;
129
- bottom: 120rpx ;
133
+ bottom: 140rpx ;
130
134
height: 40rpx;
131
135
line-height: 20rpx;
132
136
font-size: 16rpx;
133
137
text-align: center;
134
- color: #d0d0d0 ;
138
+ color: #fff ;
135
139
word-break: break-all;
136
140
}
137
141
142
+ .model-info.done .cosid {
143
+ color: #d0d0d0;
144
+ }
145
+
138
146
.model-info .timeStamp {
139
147
position: absolute;
140
148
left: 10rpx;
@@ -157,6 +165,20 @@ button.btn-left .cross-h {
157
165
line-height: 38rpx;
158
166
}
159
167
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
+
160
182
.model-info .buttonDelete {
161
183
position: absolute;
162
184
right: -20rpx;
You can’t perform that action at this time.
0 commit comments