正在显示
9 个修改的文件
包含
186 行增加
和
123 行删除
@@ -60,6 +60,10 @@ | @@ -60,6 +60,10 @@ | ||
60 | }); | 60 | }); |
61 | return promise; | 61 | return promise; |
62 | }, | 62 | }, |
63 | + | ||
64 | + | ||
65 | + | ||
66 | + | ||
63 | timeFormate(timestamp, timeType) { | 67 | timeFormate(timestamp, timeType) { |
64 | if (timestamp) { | 68 | if (timestamp) { |
65 | var timeStamp = timestamp.length == 13 ? timestamp : timestamp * 1000 | 69 | var timeStamp = timestamp.length == 13 ? timestamp : timestamp * 1000 |
@@ -81,7 +85,7 @@ | @@ -81,7 +85,7 @@ | ||
81 | }, | 85 | }, |
82 | globalData: { | 86 | globalData: { |
83 | userInfo: null, | 87 | userInfo: null, |
84 | - // baseUrl: 'http://icrgangjuren.w.brotop.cn/' | 88 | + //baseUrl: 'http://icrgangjuren.w.brotop.cn/' |
85 | baseUrl:'https://icr.gangjuren.com/' | 89 | baseUrl:'https://icr.gangjuren.com/' |
86 | } | 90 | } |
87 | } | 91 | } |
@@ -184,7 +184,7 @@ | @@ -184,7 +184,7 @@ | ||
184 | 184 | ||
185 | app.post("api/index/getBanner", '', 'get') | 185 | app.post("api/index/getBanner", '', 'get') |
186 | .then(res => { | 186 | .then(res => { |
187 | - console.log(res); | 187 | + |
188 | this.imgUrls = res | 188 | this.imgUrls = res |
189 | }) | 189 | }) |
190 | .catch(err => {}); | 190 | .catch(err => {}); |
@@ -193,7 +193,7 @@ | @@ -193,7 +193,7 @@ | ||
193 | getintroduce() { | 193 | getintroduce() { |
194 | app.post("api/index/getIntroduce", '', 'get') | 194 | app.post("api/index/getIntroduce", '', 'get') |
195 | .then(res => { | 195 | .then(res => { |
196 | - console.log(res, "数板数管简介"); | 196 | + |
197 | this.shubanintro = res[0]; | 197 | this.shubanintro = res[0]; |
198 | this.shuguanintro = res[1]; | 198 | this.shuguanintro = res[1]; |
199 | 199 | ||
@@ -265,6 +265,7 @@ | @@ -265,6 +265,7 @@ | ||
265 | }, | 265 | }, |
266 | onShow() { | 266 | onShow() { |
267 | uni.setStorageSync("baseurl",'https://icr.gangjuren.com') | 267 | uni.setStorageSync("baseurl",'https://icr.gangjuren.com') |
268 | + //uni.setStorageSync("baseurl",'http://icrgangjuren.w.brotop.cn') | ||
268 | // 判断是否有资格进入详情页 | 269 | // 判断是否有资格进入详情页 |
269 | this.get_cations() | 270 | this.get_cations() |
270 | } | 271 | } |
@@ -251,7 +251,7 @@ | @@ -251,7 +251,7 @@ | ||
251 | 251 | ||
252 | if (this.shouname == '') { | 252 | if (this.shouname == '') { |
253 | uni.showToast({ | 253 | uni.showToast({ |
254 | - title: '请填写收货人姓名', | 254 | + title: '请填写收件人姓名', |
255 | icon: 'none', | 255 | icon: 'none', |
256 | }) | 256 | }) |
257 | return false | 257 | return false |
@@ -259,7 +259,7 @@ | @@ -259,7 +259,7 @@ | ||
259 | 259 | ||
260 | if (this.shouphone == '') { | 260 | if (this.shouphone == '') { |
261 | uni.showToast({ | 261 | uni.showToast({ |
262 | - title: '请填写收货人电话', | 262 | + title: '请填写收件人电话', |
263 | icon: 'none', | 263 | icon: 'none', |
264 | }) | 264 | }) |
265 | 265 | ||
@@ -269,16 +269,15 @@ | @@ -269,16 +269,15 @@ | ||
269 | var regshouphone = /^[1][3,4,5,6,7,8,9][0-9]{9}$/; | 269 | var regshouphone = /^[1][3,4,5,6,7,8,9][0-9]{9}$/; |
270 | if (!regshouphone.test(this.shouphone)) { | 270 | if (!regshouphone.test(this.shouphone)) { |
271 | uni.showToast({ | 271 | uni.showToast({ |
272 | - title: '请填写正确的收货人电话', | 272 | + title: '请填写正确的收件人电话', |
273 | icon: 'none', | 273 | icon: 'none', |
274 | }) | 274 | }) |
275 | - | ||
276 | return false | 275 | return false |
277 | } | 276 | } |
278 | 277 | ||
279 | if (this.shouaddress == '') { | 278 | if (this.shouaddress == '') { |
280 | uni.showToast({ | 279 | uni.showToast({ |
281 | - title: '请填写收货人地址', | 280 | + title: '请填写收件人地址', |
282 | icon: 'none', | 281 | icon: 'none', |
283 | }) | 282 | }) |
284 | return false | 283 | return false |
@@ -61,15 +61,15 @@ | @@ -61,15 +61,15 @@ | ||
61 | <view class="shebeihead shugsj">数管数据</view> | 61 | <view class="shebeihead shugsj">数管数据</view> |
62 | <view class="shengyu" v-if="shenyu_times.times != 0"> | 62 | <view class="shengyu" v-if="shenyu_times.times != 0"> |
63 | <view class="sycishuleft">剩余可用次数:{{shenyu_times.times}}</view> | 63 | <view class="sycishuleft">剩余可用次数:{{shenyu_times.times}}</view> |
64 | - <view class="sycishuright"> | 64 | + <!-- <view class="sycishuright"> |
65 | <image src="/static/img/you.png"></image> | 65 | <image src="/static/img/you.png"></image> |
66 | - </view> | 66 | + </view> --> |
67 | </view> | 67 | </view> |
68 | <view class="shengyu" v-if="shenyu_times.shengyu != 0"> | 68 | <view class="shengyu" v-if="shenyu_times.shengyu != 0"> |
69 | <view class="sycishuleft">剩余可用时间:{{shenyu_times.shengyu}}</view> | 69 | <view class="sycishuleft">剩余可用时间:{{shenyu_times.shengyu}}</view> |
70 | - <view class="sycishuright"> | 70 | + <!-- <view class="sycishuright"> |
71 | <image src="/static/img/you.png"></image> | 71 | <image src="/static/img/you.png"></image> |
72 | - </view> | 72 | + </view> --> |
73 | </view> | 73 | </view> |
74 | <view class="shebeilist"> | 74 | <view class="shebeilist"> |
75 | <view class="sybanhead"> | 75 | <view class="sybanhead"> |
@@ -289,7 +289,7 @@ | @@ -289,7 +289,7 @@ | ||
289 | 289 | ||
290 | }; | 290 | }; |
291 | app.post(url, param, 'post').then(r => { | 291 | app.post(url, param, 'post').then(r => { |
292 | - console.log(r, "获取数板详情") | 292 | + |
293 | t.equipment_log = r.equipment_log; | 293 | t.equipment_log = r.equipment_log; |
294 | t.biaoshi=r.equipment_log.biaoshi; | 294 | t.biaoshi=r.equipment_log.biaoshi; |
295 | t.description=r.equipment_log.description; | 295 | t.description=r.equipment_log.description; |
@@ -385,7 +385,7 @@ | @@ -385,7 +385,7 @@ | ||
385 | // 来自页面内转发按钮 | 385 | // 来自页面内转发按钮 |
386 | } | 386 | } |
387 | return { | 387 | return { |
388 | - title: "钢聚人小程序", | 388 | + title: "智能点数小程序", |
389 | path: 'pages/shubandetail/shubandetail?share=' + 'true'+'&type='+1+'&number='+this.number+'&id='+this.id | 389 | path: 'pages/shubandetail/shubandetail?share=' + 'true'+'&type='+1+'&number='+this.number+'&id='+this.id |
390 | } | 390 | } |
391 | }, | 391 | }, |
@@ -238,7 +238,7 @@ | @@ -238,7 +238,7 @@ | ||
238 | // 来自页面内转发按钮 | 238 | // 来自页面内转发按钮 |
239 | } | 239 | } |
240 | return { | 240 | return { |
241 | - title: "钢聚人小程序", | 241 | + title: "智能点数小程序", |
242 | path: 'pages/shubanxinxi/shubanxinxi?share=' + 'true' + '&type=' + 1 + '&num=' + this.number | 242 | path: 'pages/shubanxinxi/shubanxinxi?share=' + 'true' + '&type=' + 1 + '&num=' + this.number |
243 | } | 243 | } |
244 | }, | 244 | }, |
@@ -3,15 +3,15 @@ | @@ -3,15 +3,15 @@ | ||
3 | <view class="headbox"> | 3 | <view class="headbox"> |
4 | <view class="shengyu" v-if="shengyu_time>0"> | 4 | <view class="shengyu" v-if="shengyu_time>0"> |
5 | <view class="remainleft">剩余可用时间:{{days}}天{{hours}}小时{{minutes}}分钟</view> | 5 | <view class="remainleft">剩余可用时间:{{days}}天{{hours}}小时{{minutes}}分钟</view> |
6 | - <view class="remainright"> | 6 | + <!-- <view class="remainright"> |
7 | <image src="/static/img/row.png"></image> | 7 | <image src="/static/img/row.png"></image> |
8 | + </view> --> | ||
8 | </view> | 9 | </view> |
9 | - </view> | ||
10 | - <view class="shengyu cishushengyu" v-if="shengyucishu>0"> | 10 | + <view class="shengyu cishushengyu"> |
11 | <view class="remainleft">剩余可用次数:{{shengyucishu}}</view> | 11 | <view class="remainleft">剩余可用次数:{{shengyucishu}}</view> |
12 | - <view class="remainright"> | 12 | + <!-- <view class="remainright"> |
13 | <image src="/static/img/row.png"></image> | 13 | <image src="/static/img/row.png"></image> |
14 | - </view> | 14 | + </view> --> |
15 | </view> | 15 | </view> |
16 | 16 | ||
17 | </view> | 17 | </view> |
@@ -24,6 +24,8 @@ | @@ -24,6 +24,8 @@ | ||
24 | <view class="tuce"> | 24 | <view class="tuce"> |
25 | <!-- <image src="/static/img/bendi.png"></image> --> | 25 | <!-- <image src="/static/img/bendi.png"></image> --> |
26 | <image :src="upimg"></image> | 26 | <image :src="upimg"></image> |
27 | + | ||
28 | + | ||
27 | </view> | 29 | </view> |
28 | <view class="benword">上传图片</view> | 30 | <view class="benword">上传图片</view> |
29 | </view> | 31 | </view> |
@@ -63,7 +65,7 @@ | @@ -63,7 +65,7 @@ | ||
63 | </view> | 65 | </view> |
64 | 66 | ||
65 | <!-- 确定 --> | 67 | <!-- 确定 --> |
66 | - <view class="queding" @click="queding" v-if="qudingshow">确定</view> | 68 | + <view class="queding shide" @click="queding" v-if="qudingshow">确定</view> |
67 | <view class="queding" v-else>确定</view> | 69 | <view class="queding" v-else>确定</view> |
68 | 70 | ||
69 | <view class="register" v-if="showketime"> | 71 | <view class="register" v-if="showketime"> |
@@ -77,6 +79,15 @@ | @@ -77,6 +79,15 @@ | ||
77 | </view> | 79 | </view> |
78 | </view> | 80 | </view> |
79 | 81 | ||
82 | + | ||
83 | + | ||
84 | + <view class="tupianshangchuan" v-if="picshangchuan">图片上传中</view> | ||
85 | + | ||
86 | + | ||
87 | + | ||
88 | + | ||
89 | + | ||
90 | + | ||
80 | </view> | 91 | </view> |
81 | </template> | 92 | </template> |
82 | 93 | ||
@@ -96,7 +107,8 @@ | @@ -96,7 +107,8 @@ | ||
96 | seconds: '', | 107 | seconds: '', |
97 | upload_word: '上传图片', | 108 | upload_word: '上传图片', |
98 | upimg: '', | 109 | upimg: '', |
99 | - qudingshow:true | 110 | + qudingshow: true, |
111 | + picshangchuan:false | ||
100 | } | 112 | } |
101 | }, | 113 | }, |
102 | methods: { | 114 | methods: { |
@@ -104,7 +116,9 @@ | @@ -104,7 +116,9 @@ | ||
104 | //选择照片 | 116 | //选择照片 |
105 | shoseimg() { | 117 | shoseimg() { |
106 | let t = this; | 118 | let t = this; |
107 | - let baseurl=uni.getStorageSync("baseurl") | 119 | + let baseurl = uni.getStorageSync("baseurl"); |
120 | + | ||
121 | + | ||
108 | uni.chooseImage({ | 122 | uni.chooseImage({ |
109 | count: 1, | 123 | count: 1, |
110 | sizeType: ['original', 'compressed'], | 124 | sizeType: ['original', 'compressed'], |
@@ -112,18 +126,27 @@ | @@ -112,18 +126,27 @@ | ||
112 | // sourceType: ['camera'],//拍摄照片 | 126 | // sourceType: ['camera'],//拍摄照片 |
113 | // sourceType: '', | 127 | // sourceType: '', |
114 | success: (chooseImageRes) => { | 128 | success: (chooseImageRes) => { |
115 | - console.log(909090808080) | 129 | + |
130 | + | ||
131 | + this.picshangchuan=true | ||
132 | + | ||
133 | + | ||
134 | + // uni.showToast({ | ||
135 | + // title: '图片上传中', | ||
136 | + // icon: 'none' | ||
137 | + // }) | ||
138 | + | ||
139 | + | ||
116 | const tempFilePaths = chooseImageRes.tempFilePaths; | 140 | const tempFilePaths = chooseImageRes.tempFilePaths; |
117 | 141 | ||
118 | let images = tempFilePaths[0] | 142 | let images = tempFilePaths[0] |
119 | - console.log(images) | 143 | + |
120 | let head = { | 144 | let head = { |
121 | 'token': uni.getStorageSync('token'), | 145 | 'token': uni.getStorageSync('token'), |
122 | - | ||
123 | } | 146 | } |
124 | 147 | ||
125 | uni.uploadFile({ | 148 | uni.uploadFile({ |
126 | - url: 'https://icr.gangjuren.com/api/person/upload', //仅为示例,非真实的接口地址 | 149 | + url: baseurl + '/api/person/upload', //仅为示例,非真实的接口地址 |
127 | filePath: tempFilePaths[0], | 150 | filePath: tempFilePaths[0], |
128 | name: 'images', | 151 | name: 'images', |
129 | token: uni.getStorageSync('token'), | 152 | token: uni.getStorageSync('token'), |
@@ -131,6 +154,10 @@ | @@ -131,6 +154,10 @@ | ||
131 | header: head, | 154 | header: head, |
132 | // images:images | 155 | // images:images |
133 | success: (uploadFileRes) => { | 156 | success: (uploadFileRes) => { |
157 | + this.picshangchuan=false | ||
158 | + | ||
159 | + // uni.hideLoading(); | ||
160 | + | ||
134 | console.log(uploadFileRes); | 161 | console.log(uploadFileRes); |
135 | let data = JSON.parse(uploadFileRes.data) | 162 | let data = JSON.parse(uploadFileRes.data) |
136 | console.log(data) | 163 | console.log(data) |
@@ -140,13 +167,16 @@ | @@ -140,13 +167,16 @@ | ||
140 | }); | 167 | }); |
141 | }, | 168 | }, |
142 | fail: function(err) { | 169 | fail: function(err) { |
143 | - console.log('76543221') | ||
144 | - console.log(err, "失败的回调") | 170 | + |
145 | } | 171 | } |
146 | }); | 172 | }); |
147 | 173 | ||
148 | 174 | ||
149 | 175 | ||
176 | + | ||
177 | + | ||
178 | + | ||
179 | + | ||
150 | }, | 180 | }, |
151 | 181 | ||
152 | 182 | ||
@@ -176,7 +206,7 @@ | @@ -176,7 +206,7 @@ | ||
176 | // } | 206 | // } |
177 | // }); | 207 | // }); |
178 | 208 | ||
179 | - let baseurl=uni.getStorageSync("baseurl") | 209 | + let baseurl = uni.getStorageSync("baseurl") |
180 | 210 | ||
181 | uni.chooseImage({ | 211 | uni.chooseImage({ |
182 | count: 1, | 212 | count: 1, |
@@ -185,10 +215,10 @@ | @@ -185,10 +215,10 @@ | ||
185 | sourceType: ['camera'], //拍摄照片 | 215 | sourceType: ['camera'], //拍摄照片 |
186 | // sourceType: '', | 216 | // sourceType: '', |
187 | success: (chooseImageRes) => { | 217 | success: (chooseImageRes) => { |
188 | - console.log(909090808080) | 218 | + this.picshangchuan=true |
189 | const tempFilePaths = chooseImageRes.tempFilePaths; | 219 | const tempFilePaths = chooseImageRes.tempFilePaths; |
190 | 220 | ||
191 | - let images = tempFilePaths[0] | 221 | + let images = tempFilePaths[0]; |
192 | console.log(images) | 222 | console.log(images) |
193 | let head = { | 223 | let head = { |
194 | 'token': uni.getStorageSync('token'), | 224 | 'token': uni.getStorageSync('token'), |
@@ -196,7 +226,7 @@ | @@ -196,7 +226,7 @@ | ||
196 | } | 226 | } |
197 | 227 | ||
198 | uni.uploadFile({ | 228 | uni.uploadFile({ |
199 | - url: 'https://icr.gangjuren.com/api/person/upload', //仅为示例,非真实的接口地址 | 229 | + url: baseurl + '/api/person/upload', //仅为示例,非真实的接口地址 |
200 | filePath: tempFilePaths[0], | 230 | filePath: tempFilePaths[0], |
201 | name: 'images', | 231 | name: 'images', |
202 | token: uni.getStorageSync('token'), | 232 | token: uni.getStorageSync('token'), |
@@ -204,7 +234,7 @@ | @@ -204,7 +234,7 @@ | ||
204 | header: head, | 234 | header: head, |
205 | // images:images | 235 | // images:images |
206 | success: (uploadFileRes) => { | 236 | success: (uploadFileRes) => { |
207 | - console.log(uploadFileRes); | 237 | + this.picshangchuan=false |
208 | let data = JSON.parse(uploadFileRes.data) | 238 | let data = JSON.parse(uploadFileRes.data) |
209 | console.log(data) | 239 | console.log(data) |
210 | this.upimg = data.data.src | 240 | this.upimg = data.data.src |
@@ -220,9 +250,8 @@ | @@ -220,9 +250,8 @@ | ||
220 | 250 | ||
221 | 251 | ||
222 | }, | 252 | }, |
223 | - // 获取数管剩余时间次数 | ||
224 | - | ||
225 | 253 | ||
254 | + // 获取数管剩余时间次数 | ||
226 | get_surplus() { | 255 | get_surplus() { |
227 | let t = this; | 256 | let t = this; |
228 | let param = {}; | 257 | let param = {}; |
@@ -293,7 +322,7 @@ | @@ -293,7 +322,7 @@ | ||
293 | }, | 322 | }, |
294 | queding() { | 323 | queding() { |
295 | let that = this; | 324 | let that = this; |
296 | - | 325 | + that.qudingshow = false |
297 | // uni.navigateTo({ | 326 | // uni.navigateTo({ |
298 | // url: '/pages/shuguanshujulist/shuguanshujulist' | 327 | // url: '/pages/shuguanshujulist/shuguanshujulist' |
299 | // }) | 328 | // }) |
@@ -305,7 +334,7 @@ | @@ -305,7 +334,7 @@ | ||
305 | 334 | ||
306 | return false | 335 | return false |
307 | } | 336 | } |
308 | - that.qudingshow=false | 337 | + |
309 | 338 | ||
310 | let url = "api/shuguan/setShuguan"; | 339 | let url = "api/shuguan/setShuguan"; |
311 | let param = { | 340 | let param = { |
@@ -313,28 +342,27 @@ | @@ -313,28 +342,27 @@ | ||
313 | } | 342 | } |
314 | app.post(url, param, 'post').then(r => { | 343 | app.post(url, param, 'post').then(r => { |
315 | console.log(r) | 344 | console.log(r) |
345 | + | ||
316 | uni.showToast({ | 346 | uni.showToast({ |
317 | title: '上传成功', | 347 | title: '上传成功', |
318 | icon: 'none' | 348 | icon: 'none' |
319 | }) | 349 | }) |
320 | 350 | ||
321 | - | ||
322 | - | ||
323 | setTimeout(function() { | 351 | setTimeout(function() { |
324 | uni.navigateTo({ | 352 | uni.navigateTo({ |
325 | url: '/pages/shuguanshujulist/shuguanshujulist' | 353 | url: '/pages/shuguanshujulist/shuguanshujulist' |
326 | }) | 354 | }) |
327 | 355 | ||
328 | }, 1500) | 356 | }, 1500) |
329 | - | ||
330 | - | ||
331 | - | ||
332 | }).catch(err => { | 357 | }).catch(err => { |
358 | + | ||
333 | uni.showToast({ | 359 | uni.showToast({ |
334 | title: err.msg, | 360 | title: err.msg, |
335 | icon: 'none' | 361 | icon: 'none' |
336 | }) | 362 | }) |
337 | - console.log(err) | 363 | + |
364 | + that.qudingshow = true | ||
365 | + console.log('6666', err) | ||
338 | }) | 366 | }) |
339 | 367 | ||
340 | 368 | ||
@@ -349,7 +377,7 @@ | @@ -349,7 +377,7 @@ | ||
349 | }, | 377 | }, |
350 | onShow() { | 378 | onShow() { |
351 | console.log(777) | 379 | console.log(777) |
352 | - this.qudingshow=true | 380 | + this.qudingshow = true |
353 | }, | 381 | }, |
354 | mounted() { | 382 | mounted() { |
355 | console.log(77766555) | 383 | console.log(77766555) |
@@ -381,7 +409,6 @@ | @@ -381,7 +409,6 @@ | ||
381 | .shangchuantu { | 409 | .shangchuantu { |
382 | width: 686rpx; | 410 | width: 686rpx; |
383 | background: #fff; | 411 | background: #fff; |
384 | - margin: 0 auto; | ||
385 | padding: 40rpx 32rpx; | 412 | padding: 40rpx 32rpx; |
386 | box-sizing: border-box; | 413 | box-sizing: border-box; |
387 | margin: 28rpx auto 0; | 414 | margin: 28rpx auto 0; |
@@ -400,6 +427,16 @@ | @@ -400,6 +427,16 @@ | ||
400 | height: 160rpx; | 427 | height: 160rpx; |
401 | font-size: 0; | 428 | font-size: 0; |
402 | margin-right: 28rpx; | 429 | margin-right: 28rpx; |
430 | + position: relative | ||
431 | + } | ||
432 | + | ||
433 | + .delcha { | ||
434 | + width: 46rpx; | ||
435 | + height: 46rpx; | ||
436 | + font-size: 0; | ||
437 | + position: absolute; | ||
438 | + right: -8rpx; | ||
439 | + top: -8rpx; | ||
403 | } | 440 | } |
404 | 441 | ||
405 | .tuup { | 442 | .tuup { |
@@ -524,4 +561,20 @@ | @@ -524,4 +561,20 @@ | ||
524 | line-height: 100rpx; | 561 | line-height: 100rpx; |
525 | margin: 45rpx auto 0; | 562 | margin: 45rpx auto 0; |
526 | } | 563 | } |
564 | + .tupianshangchuan{ | ||
565 | + width:200rpx; | ||
566 | + height:50rpx; | ||
567 | + background: #3E3A39; | ||
568 | + color:#fff; | ||
569 | + font-size: 24rpx; | ||
570 | + text-align: center; | ||
571 | + line-height: 50rpx; | ||
572 | + opacity: 0.5; | ||
573 | + position: absolute; | ||
574 | + border-radius: 20rpx; | ||
575 | + top:45%; | ||
576 | + left:50%; | ||
577 | + transform: translate(-50%,-50%) | ||
578 | + } | ||
579 | + | ||
527 | </style> | 580 | </style> |
@@ -28,24 +28,94 @@ | @@ -28,24 +28,94 @@ | ||
28 | <view class="headbox"> | 28 | <view class="headbox"> |
29 | <view class="shengyu"> | 29 | <view class="shengyu"> |
30 | <view class="remainleft">剩余可用时间:{{shengyu_time}}</view> | 30 | <view class="remainleft">剩余可用时间:{{shengyu_time}}</view> |
31 | - <view class="remainright"> | 31 | + <!-- <view class="remainright"> |
32 | <image src="/static/img/row.png"></image> | 32 | <image src="/static/img/row.png"></image> |
33 | - </view> | 33 | + </view> --> |
34 | </view> | 34 | </view> |
35 | <view class="shengyu cishushengyu"> | 35 | <view class="shengyu cishushengyu"> |
36 | <view class="remainleft">剩余可用次数:{{times}}</view> | 36 | <view class="remainleft">剩余可用次数:{{times}}</view> |
37 | - <view class="remainright"> | 37 | + <!-- <view class="remainright"> |
38 | <image src="/static/img/row.png"></image> | 38 | <image src="/static/img/row.png"></image> |
39 | + </view> --> | ||
40 | + </view> | ||
41 | + | ||
42 | + </view> | ||
43 | + <!--管径描述 --> | ||
44 | + <view class="guanjing"> | ||
45 | + <view class='guanjinghead'> | ||
46 | + <view class="gudes">管径描述</view> | ||
47 | + <view class="gudes">明确数量</view> | ||
48 | + <view class="gudes">疑似数量</view> | ||
49 | + <view class="gudes">复核数量</view> | ||
50 | + <view class="writeheng"></view> | ||
51 | + </view> | ||
52 | + <view class="guanlistbox"> | ||
53 | + <view class="guanlist" v-for="(item,index) in log_list" :key="index" @click="fengxiangshare?fuhe(item.id):''" > | ||
54 | + <view class="guanitem">{{item.type}}</view> | ||
55 | + <view class="guanitem">{{item.confirmation}}</view> | ||
56 | + <view class="guanitem">{{item.distrust}}</view> | ||
57 | + <view class="guanitem">{{item.fuhe}}</view> | ||
58 | + <view class="write" > | ||
59 | + <image src="/static/img/write.png"></image> | ||
39 | </view> | 60 | </view> |
40 | </view> | 61 | </view> |
41 | 62 | ||
63 | + | ||
64 | + <!-- <view class="guanlist" v-for="(item,index1) in log_list" :key="index1" v-else> | ||
65 | + <view class="guanitem">{{item.type}}</view> | ||
66 | + <view class="guanitem">{{item.confirmation}}</view> | ||
67 | + <view class="guanitem">{{item.distrust}}</view> | ||
68 | + <view class="guanitem">{{item.fuhe}}</view> | ||
69 | + <view class="write" > | ||
70 | + <image src="/static/img/write.png"></image> | ||
71 | + </view> | ||
72 | + </view> --> | ||
73 | + <!-- <view class="guanlist"> | ||
74 | + <view class="guanitem">DN50</view> | ||
75 | + <view class="guanitem">5000</view> | ||
76 | + <view class="guanitem">3000</view> | ||
77 | + <view class="guanitem">3000</view> | ||
78 | + <view class="write"> | ||
79 | + <image src="/static/img/write.png"></image> | ||
80 | + </view> | ||
81 | + </view> | ||
82 | + <view class="guanlist"> | ||
83 | + | ||
84 | + <view class="guanitem">DN50</view> | ||
85 | + <view class="guanitem">5000</view> | ||
86 | + <view class="guanitem">3000</view> | ||
87 | + <view class="guanitem">3000</view> | ||
88 | + <view class="write"> | ||
89 | + <image src="/static/img/write.png"></image> | ||
90 | + </view> | ||
91 | + </view> --> | ||
92 | + | ||
93 | + </view> | ||
94 | + | ||
95 | + <view class="dibushujushow"> | ||
96 | + <view class='dibushujushowitem'> | ||
97 | + <view class="dibushutop">明确总数</view> | ||
98 | + <view class="dibushubottom">{{count.confirmation}}</view> | ||
99 | + </view> | ||
100 | + <view class='dibushujushowitem'> | ||
101 | + <view class="dibushutop">疑似总数</view> | ||
102 | + <view class="dibushubottom">{{count.distrust}}</view> | ||
103 | + </view> | ||
104 | + <view class='dibushujushowitem'> | ||
105 | + <view class="dibushutop">复核总数</view> | ||
106 | + <view class="dibushubottom">{{count.fuhe}}</view> | ||
107 | + </view> | ||
108 | + </view> | ||
42 | </view> | 109 | </view> |
110 | + | ||
111 | + | ||
112 | + | ||
43 | <view class="imgupload"> | 113 | <view class="imgupload"> |
44 | <view class="shangword">上传图片</view> | 114 | <view class="shangword">上传图片</view> |
45 | <view class="shangbox"> | 115 | <view class="shangbox"> |
46 | <view class="shangbox"> | 116 | <view class="shangbox"> |
47 | <view class='shangboxitem' v-for="(item,index) in fileimg" :key="index"> | 117 | <view class='shangboxitem' v-for="(item,index) in fileimg" :key="index"> |
48 | - <image :src="item" mode="widthFix" @click="viewimg(index)"></image> | 118 | + <image :src="item" mode="aspectFit" @click="viewimg(index)"></image> |
49 | </view> | 119 | </view> |
50 | 120 | ||
51 | </view> | 121 | </view> |
@@ -56,7 +126,7 @@ | @@ -56,7 +126,7 @@ | ||
56 | <view class="shangword shibie">识别图片</view> | 126 | <view class="shangword shibie">识别图片</view> |
57 | <view class="shangbox"> | 127 | <view class="shangbox"> |
58 | <view class='shangboxitem' v-for="(img,index) in images" :key='index'> | 128 | <view class='shangboxitem' v-for="(img,index) in images" :key='index'> |
59 | - <image :src="img" mode="widthFix" @click="viewimgtu(index)"></image> | 129 | + <image :src="img" mode="aspectFit" @click="viewimgtu(index)"></image> |
60 | </view> | 130 | </view> |
61 | <!-- <view class='shangboxitem'> | 131 | <!-- <view class='shangboxitem'> |
62 | <image src="/static/img/shang.png"></image> | 132 | <image src="/static/img/shang.png"></image> |
@@ -130,73 +200,6 @@ | @@ -130,73 +200,6 @@ | ||
130 | </view> | 200 | </view> |
131 | </view> | 201 | </view> |
132 | </view> | 202 | </view> |
133 | - <!--管径描述 --> | ||
134 | - <view class="guanjing"> | ||
135 | - <view class='guanjinghead'> | ||
136 | - <view class="gudes">管径描述</view> | ||
137 | - <view class="gudes">明确数量</view> | ||
138 | - <view class="gudes">疑似数量</view> | ||
139 | - <view class="gudes">复核数量</view> | ||
140 | - <view class="writeheng"></view> | ||
141 | - </view> | ||
142 | - <view class="guanlistbox"> | ||
143 | - <view class="guanlist" v-for="(item,index) in log_list" :key="index" @click="fengxiangshare?fuhe(item.id):''" > | ||
144 | - <view class="guanitem">{{item.type}}</view> | ||
145 | - <view class="guanitem">{{item.confirmation}}</view> | ||
146 | - <view class="guanitem">{{item.distrust}}</view> | ||
147 | - <view class="guanitem">{{item.fuhe}}</view> | ||
148 | - <view class="write" > | ||
149 | - <image src="/static/img/write.png"></image> | ||
150 | - </view> | ||
151 | - </view> | ||
152 | - | ||
153 | - | ||
154 | - <!-- <view class="guanlist" v-for="(item,index1) in log_list" :key="index1" v-else> | ||
155 | - <view class="guanitem">{{item.type}}</view> | ||
156 | - <view class="guanitem">{{item.confirmation}}</view> | ||
157 | - <view class="guanitem">{{item.distrust}}</view> | ||
158 | - <view class="guanitem">{{item.fuhe}}</view> | ||
159 | - <view class="write" > | ||
160 | - <image src="/static/img/write.png"></image> | ||
161 | - </view> | ||
162 | - </view> --> | ||
163 | - <!-- <view class="guanlist"> | ||
164 | - <view class="guanitem">DN50</view> | ||
165 | - <view class="guanitem">5000</view> | ||
166 | - <view class="guanitem">3000</view> | ||
167 | - <view class="guanitem">3000</view> | ||
168 | - <view class="write"> | ||
169 | - <image src="/static/img/write.png"></image> | ||
170 | - </view> | ||
171 | - </view> | ||
172 | - <view class="guanlist"> | ||
173 | - | ||
174 | - <view class="guanitem">DN50</view> | ||
175 | - <view class="guanitem">5000</view> | ||
176 | - <view class="guanitem">3000</view> | ||
177 | - <view class="guanitem">3000</view> | ||
178 | - <view class="write"> | ||
179 | - <image src="/static/img/write.png"></image> | ||
180 | - </view> | ||
181 | - </view> --> | ||
182 | - | ||
183 | - </view> | ||
184 | - | ||
185 | - <view class="dibushujushow"> | ||
186 | - <view class='dibushujushowitem'> | ||
187 | - <view class="dibushutop">明确总数</view> | ||
188 | - <view class="dibushubottom">{{count.confirmation}}</view> | ||
189 | - </view> | ||
190 | - <view class='dibushujushowitem'> | ||
191 | - <view class="dibushutop">疑似总数</view> | ||
192 | - <view class="dibushubottom">{{count.distrust}}</view> | ||
193 | - </view> | ||
194 | - <view class='dibushujushowitem'> | ||
195 | - <view class="dibushutop">复核总数</view> | ||
196 | - <view class="dibushubottom">{{count.fuhe}}</view> | ||
197 | - </view> | ||
198 | - </view> | ||
199 | - </view> | ||
200 | 203 | ||
201 | <!-- 遮罩层 --> | 204 | <!-- 遮罩层 --> |
202 | <view class="register" v-if="yewushow"> | 205 | <view class="register" v-if="yewushow"> |
@@ -644,7 +647,7 @@ | @@ -644,7 +647,7 @@ | ||
644 | // 来自页面内转发按钮 | 647 | // 来自页面内转发按钮 |
645 | } | 648 | } |
646 | return { | 649 | return { |
647 | - title: "钢聚人小程序", | 650 | + title: "智能点数小程序", |
648 | path: 'pages/shuguanshujudetail/shuguanshujudetail?share=' + 'true' + '&type=' + 1 + '&id=' + this.id | 651 | path: 'pages/shuguanshujudetail/shuguanshujudetail?share=' + 'true' + '&type=' + 1 + '&id=' + this.id |
649 | } | 652 | } |
650 | }, | 653 | }, |
@@ -871,6 +874,9 @@ | @@ -871,6 +874,9 @@ | ||
871 | padding: 28rpx 34rpx; | 874 | padding: 28rpx 34rpx; |
872 | box-sizing: border-box; | 875 | box-sizing: border-box; |
873 | } | 876 | } |
877 | + .guanjing{ | ||
878 | + margin-top:20rpx; | ||
879 | + } | ||
874 | 880 | ||
875 | .guanlist { | 881 | .guanlist { |
876 | display: flex; | 882 | display: flex; |
@@ -10,15 +10,15 @@ | @@ -10,15 +10,15 @@ | ||
10 | <view class="headbox"> | 10 | <view class="headbox"> |
11 | <view class="shengyu"> | 11 | <view class="shengyu"> |
12 | <view class="remainleft">剩余可用时间:{{days}}天{{hours}}小时{{minutes}}分钟</view> | 12 | <view class="remainleft">剩余可用时间:{{days}}天{{hours}}小时{{minutes}}分钟</view> |
13 | - <view class="remainright"> | 13 | + <!-- <view class="remainright"> |
14 | <image src="/static/img/row.png"></image> | 14 | <image src="/static/img/row.png"></image> |
15 | - </view> | 15 | + </view> --> |
16 | </view> | 16 | </view> |
17 | <view class="shengyu cishushengyu"> | 17 | <view class="shengyu cishushengyu"> |
18 | <view class="remainleft">剩余可用次数:{{times}}</view> | 18 | <view class="remainleft">剩余可用次数:{{times}}</view> |
19 | - <view class="remainright"> | 19 | + <!-- <view class="remainright"> |
20 | <image src="/static/img/row.png"></image> | 20 | <image src="/static/img/row.png"></image> |
21 | - </view> | 21 | + </view> --> |
22 | </view> | 22 | </view> |
23 | 23 | ||
24 | </view> | 24 | </view> |
-
请 注册 或 登录 后发表评论