作者 lihongjuan

222

@@ -264,6 +264,7 @@ @@ -264,6 +264,7 @@
264 this.getintroduce() 264 this.getintroduce()
265 }, 265 },
266 onShow() { 266 onShow() {
  267 + uni.setStorageSync("baseurl",'https://icr.gangjuren.com')
267 // 判断是否有资格进入详情页 268 // 判断是否有资格进入详情页
268 this.get_cations() 269 this.get_cations()
269 } 270 }
@@ -25,21 +25,39 @@ @@ -25,21 +25,39 @@
25 <view class="toutext"> 25 <view class="toutext">
26 <input type="text" placeholder="请输入姓名" :value="name" @blur="entername" /> 26 <input type="text" placeholder="请输入姓名" :value="name" @blur="entername" />
27 </view> 27 </view>
28 - <view class="rowright"> 28 + <!-- <view class="rowright">
29 <image src="/static/img/rowright.png"></image> 29 <image src="/static/img/rowright.png"></image>
30 - </view> 30 + </view> -->
31 </view> 31 </view>
32 </view> 32 </view>
33 33
34 - <view class="gerenitem"> 34 + <view class="gerenitem" v-if="bangdingkehu==''" @click="bangding_kehu">
35 <view class="gerenleft"> 35 <view class="gerenleft">
36 公司名称 36 公司名称
37 </view> 37 </view>
38 <view class="gerenright"> 38 <view class="gerenright">
39 - <view class="toutext" v-if="bangdingkehu==''" @click="bangding_kehu"> 39 + <view class="toutext" >
40 绑定公司 40 绑定公司
41 </view> 41 </view>
42 - <view class="toutext" v-else @click="bangding_kehu"> 42 + <!-- <view class="toutext" v-else @click="bangding_kehu">
  43 + {{bangdingkehu}}
  44 + </view> -->
  45 + <view class="rowright">
  46 + <image src="/static/img/rowright.png"></image>
  47 + </view>
  48 + </view>
  49 + </view>
  50 +
  51 +
  52 + <view class="gerenitem" v-else @click="bangding_kehu">
  53 + <view class="gerenleft">
  54 + 公司名称
  55 + </view>
  56 + <view class="gerenright">
  57 + <!-- <view class="toutext" v-if="bangdingkehu==''" @click="bangding_kehu">
  58 + 绑定公司
  59 + </view> -->
  60 + <view class="toutext" >
43 {{bangdingkehu}} 61 {{bangdingkehu}}
44 </view> 62 </view>
45 <view class="rowright"> 63 <view class="rowright">
@@ -47,22 +65,45 @@ @@ -47,22 +65,45 @@
47 </view> 65 </view>
48 </view> 66 </view>
49 </view> 67 </view>
  68 +
  69 +
  70 +
50 71
51 - <view class="gerenitem"> 72 + <view class="gerenitem" v-if="bangdingpeople==''" @click="bangding">
52 <view class="gerenleft"> 73 <view class="gerenleft">
53 推荐人 74 推荐人
54 </view> 75 </view>
55 <view class="gerenright"> 76 <view class="gerenright">
56 - <view class="toutext" v-if="bangdingpeople==''" @click="bangding"> 77 + <view class="toutext" >
57 绑定推荐人 78 绑定推荐人
58 </view> 79 </view>
59 - <view class="toutext" v-else @click="bangding"> 80 + <!-- <view class="toutext" v-else @click="bangding">
  81 + {{bangdingpeople}}
  82 + </view> -->
  83 + <view class="rowright">
  84 + <image src="/static/img/rowright.png"></image>
  85 + </view>
  86 + </view>
  87 +
  88 + </view>
  89 +
  90 +
  91 + <view class="gerenitem" v-else @click="bangding">
  92 + <view class="gerenleft">
  93 + 推荐人
  94 + </view>
  95 + <view class="gerenright">
  96 + <!-- <view class="toutext" v-if="bangdingpeople==''" @click="bangding">
  97 + 绑定推荐人
  98 + </view> -->
  99 + <view class="toutext" >
60 {{bangdingpeople}} 100 {{bangdingpeople}}
61 </view> 101 </view>
62 <view class="rowright"> 102 <view class="rowright">
63 <image src="/static/img/rowright.png"></image> 103 <image src="/static/img/rowright.png"></image>
64 </view> 104 </view>
65 </view> 105 </view>
  106 +
66 </view> 107 </view>
67 </view> 108 </view>
68 <view class="register" v-if="showbang"> 109 <view class="register" v-if="showbang">
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <view class="fapiaoitem"> 5 <view class="fapiaoitem">
6 6
7 7
8 - <view class="fleft">抬头类型</view> 8 + <view class="fleft lei">抬头类型</view>
9 <view class="fright"> 9 <view class="fright">
10 <!-- <view class="qdan">企业单位</view> --> 10 <!-- <view class="qdan">企业单位</view> -->
11 <view class="qdan"> 11 <view class="qdan">
@@ -19,13 +19,13 @@ @@ -19,13 +19,13 @@
19 </view> 19 </view>
20 </picker> 20 </picker>
21 <view class="fapiaoitem"> 21 <view class="fapiaoitem">
22 - <view class="fleft">发票抬头</view> 22 + <view class="fleft lei">发票抬头</view>
23 <view class="fright fatai"> 23 <view class="fright fatai">
24 <input type="text" placeholder="填写发票抬头" placeholder-class="fapiao" v-model="taitou" /> 24 <input type="text" placeholder="填写发票抬头" placeholder-class="fapiao" v-model="taitou" />
25 </view> 25 </view>
26 </view> 26 </view>
27 <view class="fapiaoitem"> 27 <view class="fapiaoitem">
28 - <view class="fleft">税号</view> 28 + <view class="fleft lei">税号</view>
29 <view class="fright fatai"> 29 <view class="fright fatai">
30 <input type="text" placeholder="填写纳税人识别号" placeholder-class="fapiao" v-model="shuihao" /> 30 <input type="text" placeholder="填写纳税人识别号" placeholder-class="fapiao" v-model="shuihao" />
31 </view> 31 </view>
@@ -87,19 +87,19 @@ @@ -87,19 +87,19 @@
87 <view class="fapiaolist"> 87 <view class="fapiaolist">
88 <view class="shouinfo">收件人信息</view> 88 <view class="shouinfo">收件人信息</view>
89 <view class="fapiaoitem"> 89 <view class="fapiaoitem">
90 - <view class="fleft">姓名</view> 90 + <view class="fleft lei">姓名</view>
91 <view class="fright fatai"> 91 <view class="fright fatai">
92 <input type="text" placeholder="填写收件人姓名" placeholder-class="fapiao" v-model="shouname" /> 92 <input type="text" placeholder="填写收件人姓名" placeholder-class="fapiao" v-model="shouname" />
93 </view> 93 </view>
94 </view> 94 </view>
95 <view class="fapiaoitem"> 95 <view class="fapiaoitem">
96 - <view class="fleft">电话</view> 96 + <view class="fleft lei">电话</view>
97 <view class="fright fatai"> 97 <view class="fright fatai">
98 <input type="text" placeholder="填写收件人电话" placeholder-class="fapiao" v-model="shouphone" /> 98 <input type="text" placeholder="填写收件人电话" placeholder-class="fapiao" v-model="shouphone" />
99 </view> 99 </view>
100 </view> 100 </view>
101 <view class="fapiaoitem"> 101 <view class="fapiaoitem">
102 - <view class="fleft">地址</view> 102 + <view class="fleft lei">地址</view>
103 <view class="fright fatai"> 103 <view class="fright fatai">
104 <input type="text" placeholder="填写收件人地址" placeholder-class="fapiao" v-model="shouaddress" /> 104 <input type="text" placeholder="填写收件人地址" placeholder-class="fapiao" v-model="shouaddress" />
105 </view> 105 </view>
@@ -194,67 +194,66 @@ @@ -194,67 +194,66 @@
194 return false 194 return false
195 } 195 }
196 196
197 - if (this.remark == '') {  
198 - uni.showToast({  
199 - title: '请填写备注说明',  
200 - icon: 'none',  
201 - })  
202 -  
203 - return false  
204 - }  
205 -  
206 - if (this.address == '') {  
207 - uni.showToast({  
208 - title: '请填写地址',  
209 - icon: 'none',  
210 - })  
211 -  
212 - return false  
213 - }  
214 -  
215 - if (this.phone == '') {  
216 - uni.showToast({  
217 - title: '请填写电话',  
218 - icon: 'none',  
219 - })  
220 -  
221 - return false  
222 - }  
223 -  
224 - var regphone = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;  
225 - if (!regphone.test(this.phone)) {  
226 - uni.showToast({  
227 - title: '请填写正确的电话',  
228 - icon: 'none',  
229 - })  
230 -  
231 - return false  
232 - }  
233 -  
234 - if (this.bank == '') {  
235 - uni.showToast({  
236 - title: '请填写开户行',  
237 - icon: 'none',  
238 - })  
239 -  
240 - return false  
241 - }  
242 -  
243 - if (this.banknum == '') {  
244 - uni.showToast({  
245 - title: '请填写开户行账号',  
246 - icon: 'none',  
247 - })  
248 -  
249 - return false  
250 - } 197 +// if (this.remark == '') {
  198 +// uni.showToast({
  199 +// title: '请填写备注说明',
  200 +// icon: 'none',
  201 +// })
  202 +//
  203 +// return false
  204 +// }
  205 +//
  206 +// if (this.address == '') {
  207 +// uni.showToast({
  208 +// title: '请填写地址',
  209 +// icon: 'none',
  210 +// })
  211 +//
  212 +// return false
  213 +// }
  214 +//
  215 +// if (this.phone == '') {
  216 +// uni.showToast({
  217 +// title: '请填写电话',
  218 +// icon: 'none',
  219 +// })
  220 +//
  221 +// return false
  222 +// }
  223 +
  224 +// var regphone = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
  225 +// if (!regphone.test(this.phone)) {
  226 +// uni.showToast({
  227 +// title: '请填写正确的电话',
  228 +// icon: 'none',
  229 +// })
  230 +//
  231 +// return false
  232 +// }
  233 +
  234 +// if (this.bank == '') {
  235 +// uni.showToast({
  236 +// title: '请填写开户行',
  237 +// icon: 'none',
  238 +// })
  239 +//
  240 +// return false
  241 +// }
  242 +
  243 +// if (this.banknum == '') {
  244 +// uni.showToast({
  245 +// title: '请填写开户行账号',
  246 +// icon: 'none',
  247 +// })
  248 +//
  249 +// return false
  250 +// }
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 -  
258 return false 257 return false
259 } 258 }
260 259
@@ -286,8 +285,6 @@ @@ -286,8 +285,6 @@
286 } 285 }
287 286
288 this.kaipiaoshow=false 287 this.kaipiaoshow=false
289 -  
290 -  
291 var param = { 288 var param = {
292 order_ids:this.select_id, 289 order_ids:this.select_id,
293 type: this.selectid, 290 type: this.selectid,
@@ -481,4 +478,17 @@ @@ -481,4 +478,17 @@
481 line-height: 100rpx; 478 line-height: 100rpx;
482 margin: 34rpx auto; 479 margin: 34rpx auto;
483 } 480 }
  481 + .lei{
  482 + position: relative;
  483 +
  484 + }
  485 + .lei:before{
  486 + display:block;
  487 + content: "*";
  488 + color:#E60000;
  489 + font-size: 30rpx;
  490 + position: absolute;
  491 + top:0;
  492 + left:-15rpx;
  493 + }
484 </style> 494 </style>
@@ -79,14 +79,14 @@ @@ -79,14 +79,14 @@
79 <view class="sybanitem">详情</view> 79 <view class="sybanitem">详情</view>
80 </view> 80 </view>
81 <view class="shebeilitem" v-for="(item,index) in guan_list" :key="index" v-if="guan_list != ''"> 81 <view class="shebeilitem" v-for="(item,index) in guan_list" :key="index" v-if="guan_list != ''">
82 - <view class="sbitem sbdate">{{item.date}}<br/>{{item.time}}</view> 82 + <view class="sbitem sbdate">{{item.date}}<br />{{item.time}}</view>
83 <view class="sbitem sbhao">{{item.image_id}}</view> 83 <view class="sbitem sbhao">{{item.image_id}}</view>
84 <view class="sbitem sbt"> 84 <view class="sbitem sbt">
85 <image :src="item.files"></image> 85 <image :src="item.files"></image>
86 </view> 86 </view>
87 <view class="sbitem ck" @click="look_guan(item.id)">查看</view> 87 <view class="sbitem ck" @click="look_guan(item.id)">查看</view>
88 </view> 88 </view>
89 - <view class="shebeilitem" v-if="guan_list == ''"> 89 + <view class="shebeilitem" v-if="guan_list.length==0">
90 <view class="nodatas">暂无数据</view> 90 <view class="nodatas">暂无数据</view>
91 </view> 91 </view>
92 </view> 92 </view>
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 cHeight: '', 118 cHeight: '',
119 pixelRatio: 1, 119 pixelRatio: 1,
120 // 获取剩余可用次数 120 // 获取剩余可用次数
121 - shenyu_times:"", 121 + shenyu_times: "",
122 // 图表数据 122 // 图表数据
123 //*数板*// 123 //*数板*//
124 shuban: [], 124 shuban: [],
@@ -129,7 +129,8 @@ @@ -129,7 +129,8 @@
129 shuguan: [], 129 shuguan: [],
130 shuguan_x: [], 130 shuguan_x: [],
131 /*数管列表数据*/ 131 /*数管列表数据*/
132 - guan_list:"" 132 + guan_list: [],
  133 + page: 1
133 } 134 }
134 }, 135 },
135 onLoad() { 136 onLoad() {
@@ -147,7 +148,7 @@ @@ -147,7 +148,7 @@
147 let ban = []; 148 let ban = [];
148 let banX = [] 149 let banX = []
149 app.post(url, param, 'post').then(r => { 150 app.post(url, param, 'post').then(r => {
150 - console.log('88888888',r) 151 + console.log('88888888', r)
151 for (var i = 0; i < r.user_equipment_log.length; i++) { 152 for (var i = 0; i < r.user_equipment_log.length; i++) {
152 banX.unshift(r.user_equipment_log[i].date) 153 banX.unshift(r.user_equipment_log[i].date)
153 ban.unshift(r.user_equipment_log[i].count) 154 ban.unshift(r.user_equipment_log[i].count)
@@ -156,9 +157,9 @@ @@ -156,9 +157,9 @@
156 t.shuban_x = banX; 157 t.shuban_x = banX;
157 t.getServerData1(); 158 t.getServerData1();
158 t.ban_list = r.equipment; 159 t.ban_list = r.equipment;
159 -  
160 - let newban_list=t.ban_list;  
161 - for(var obj of newban_list){ 160 +
  161 + let newban_list = t.ban_list;
  162 + for (var obj of newban_list) {
162 let number = obj.time; 163 let number = obj.time;
163 // // 时间戳处理 164 // // 时间戳处理
164 var totalSecond = number; 165 var totalSecond = number;
@@ -171,19 +172,19 @@ @@ -171,19 +172,19 @@
171 // 小时位 172 // 小时位
172 var hr = Math.floor((second - day * 3600 * 24) / 3600); 173 var hr = Math.floor((second - day * 3600 * 24) / 3600);
173 var hrStr = hr.toString(); 174 var hrStr = hr.toString();
174 - if (hrStr.length == 1) hrStr = hrStr; 175 + if (hrStr.length == 1) hrStr = hrStr;
175 // 分钟位 176 // 分钟位
176 var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60); 177 var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60);
177 var minStr = min.toString(); 178 var minStr = min.toString();
178 - if (minStr.length == 1) minStr = minStr; 179 + if (minStr.length == 1) minStr = minStr;
179 // 秒位 180 // 秒位
180 var sec = second - day * 3600 * 24 - hr * 3600 - min * 60; 181 var sec = second - day * 3600 * 24 - hr * 3600 - min * 60;
181 var secStr = sec.toString(); 182 var secStr = sec.toString();
182 - if (secStr.length == 1) secStr = secStr;  
183 - obj.time = dayStr + '天' + hrStr + '小时' + minStr + "分钟" 183 + if (secStr.length == 1) secStr = secStr;
  184 + obj.time = dayStr + '天' + hrStr + '小时' + minStr + "分钟"
184 } 185 }
185 - this.ban_list=newban_list  
186 - 186 + this.ban_list = newban_list
  187 +
187 }).catch(err => { 188 }).catch(err => {
188 console.log(err) 189 console.log(err)
189 }) 190 })
@@ -192,7 +193,9 @@ @@ -192,7 +193,9 @@
192 get_shuguanchart() { 193 get_shuguanchart() {
193 let t = this; 194 let t = this;
194 let url = "api/person/getUserShuguanLog"; 195 let url = "api/person/getUserShuguanLog";
195 - let param = {}; 196 + let param = {
  197 + page: this.page
  198 + };
196 let guan = []; 199 let guan = [];
197 let guanX = [] 200 let guanX = []
198 app.post(url, param, 'post').then(r => { 201 app.post(url, param, 'post').then(r => {
@@ -203,15 +206,17 @@ @@ -203,15 +206,17 @@
203 t.shuguan = guan; 206 t.shuguan = guan;
204 t.shuguan_x = guanX; 207 t.shuguan_x = guanX;
205 t.getServerData(); 208 t.getServerData();
206 - t.guan_list = r.shuguan 209 + //t.guan_list =r.shuguan
  210 + t.guan_list = t.guan_list.concat(r.shuguan);
  211 + console.log('9999', t.guan_list)
207 }).catch(err => { 212 }).catch(err => {
208 console.log(err) 213 console.log(err)
209 }) 214 })
210 }, 215 },
211 -  
212 -  
213 - timechange(){  
214 - let number = this.shengyuqixian; 216 +
  217 +
  218 + timechange() {
  219 + let number = this.shengyuqixian;
215 // // 时间戳处理 220 // // 时间戳处理
216 var totalSecond = number; 221 var totalSecond = number;
217 var second = totalSecond; 222 var second = totalSecond;
@@ -223,24 +228,24 @@ @@ -223,24 +228,24 @@
223 // 小时位 228 // 小时位
224 var hr = Math.floor((second - day * 3600 * 24) / 3600); 229 var hr = Math.floor((second - day * 3600 * 24) / 3600);
225 var hrStr = hr.toString(); 230 var hrStr = hr.toString();
226 - if (hrStr.length == 1) hrStr = hrStr; 231 + if (hrStr.length == 1) hrStr = hrStr;
227 // 分钟位 232 // 分钟位
228 var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60); 233 var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60);
229 var minStr = min.toString(); 234 var minStr = min.toString();
230 - if (minStr.length == 1) minStr = minStr; 235 + if (minStr.length == 1) minStr = minStr;
231 // 秒位 236 // 秒位
232 var sec = second - day * 3600 * 24 - hr * 3600 - min * 60; 237 var sec = second - day * 3600 * 24 - hr * 3600 - min * 60;
233 var secStr = sec.toString(); 238 var secStr = sec.toString();
234 - if (secStr.length == 1) secStr = secStr;  
235 - this.showshengyuqixian = dayStr + '天' + hrStr + '小时' + minStr + "分钟"  
236 -  
237 -  
238 -  
239 - 239 + if (secStr.length == 1) secStr = secStr;
  240 + this.showshengyuqixian = dayStr + '天' + hrStr + '小时' + minStr + "分钟"
  241 +
  242 +
  243 +
  244 +
240 }, 245 },
241 -  
242 -  
243 - 246 +
  247 +
  248 +
244 getServerData() { 249 getServerData() {
245 let t = this; 250 let t = this;
246 uni.request({ 251 uni.request({
@@ -296,27 +301,27 @@ @@ -296,27 +301,27 @@
296 }); 301 });
297 }, 302 },
298 // 前往数板详情 303 // 前往数板详情
299 - go_shuban(e){ 304 + go_shuban(e) {
300 console.log(e) 305 console.log(e)
301 uni.navigateTo({ 306 uni.navigateTo({
302 - url: '/pages/shubanxinxi/shubanxinxi?num='+e.number, 307 + url: '/pages/shubanxinxi/shubanxinxi?num=' + e.number,
303 success: res => {}, 308 success: res => {},
304 fail: () => {}, 309 fail: () => {},
305 complete: () => {} 310 complete: () => {}
306 }); 311 });
307 }, 312 },
308 // 获取剩余可用次数 313 // 获取剩余可用次数
309 - get_shenyu(){ 314 + get_shenyu() {
310 let t = this; 315 let t = this;
311 let url = "api/shuguan/getShuguanRule"; 316 let url = "api/shuguan/getShuguanRule";
312 let param = {}; 317 let param = {};
313 - app.post(url,param,'post').then(r =>{  
314 - console.log(r,"获取剩余可用次数") 318 + app.post(url, param, 'post').then(r => {
  319 + console.log(r, "获取剩余可用次数")
315 t.shenyu_times = r; 320 t.shenyu_times = r;
316 - let newshenyu_times=t.shenyu_times;  
317 -  
318 -  
319 - let number = newshenyu_times.shengyu; 321 + let newshenyu_times = t.shenyu_times;
  322 +
  323 +
  324 + let number = newshenyu_times.shengyu;
320 // // 时间戳处理 325 // // 时间戳处理
321 var totalSecond = number; 326 var totalSecond = number;
322 var second = totalSecond; 327 var second = totalSecond;
@@ -328,28 +333,28 @@ @@ -328,28 +333,28 @@
328 // 小时位 333 // 小时位
329 var hr = Math.floor((second - day * 3600 * 24) / 3600); 334 var hr = Math.floor((second - day * 3600 * 24) / 3600);
330 var hrStr = hr.toString(); 335 var hrStr = hr.toString();
331 - if (hrStr.length == 1) hrStr = hrStr; 336 + if (hrStr.length == 1) hrStr = hrStr;
332 // 分钟位 337 // 分钟位
333 var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60); 338 var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60);
334 var minStr = min.toString(); 339 var minStr = min.toString();
335 - if (minStr.length == 1) minStr = minStr; 340 + if (minStr.length == 1) minStr = minStr;
336 // 秒位 341 // 秒位
337 var sec = second - day * 3600 * 24 - hr * 3600 - min * 60; 342 var sec = second - day * 3600 * 24 - hr * 3600 - min * 60;
338 var secStr = sec.toString(); 343 var secStr = sec.toString();
339 - if (secStr.length == 1) secStr = secStr;  
340 - newshenyu_times.shengyu = dayStr + '天' + hrStr + '小时' + minStr + "分钟"  
341 -  
342 -  
343 - this.shenyu_times=newshenyu_times  
344 - }).catch(err =>{ 344 + if (secStr.length == 1) secStr = secStr;
  345 + newshenyu_times.shengyu = dayStr + '天' + hrStr + '小时' + minStr + "分钟"
  346 +
  347 +
  348 + this.shenyu_times = newshenyu_times
  349 + }).catch(err => {
345 console.log(err) 350 console.log(err)
346 - }) 351 + })
347 }, 352 },
348 // 数管列表查看 353 // 数管列表查看
349 - look_guan(e){ 354 + look_guan(e) {
350 console.log(e) 355 console.log(e)
351 uni.navigateTo({ 356 uni.navigateTo({
352 - url: '/pages/shuguanshujudetail/shuguanshujudetail?id='+e, 357 + url: '/pages/shuguanshujudetail/shuguanshujudetail?id=' + e,
353 success: res => {}, 358 success: res => {},
354 fail: () => {}, 359 fail: () => {},
355 complete: () => {} 360 complete: () => {}
@@ -435,6 +440,9 @@ @@ -435,6 +440,9 @@
435 this.getServerData1(); 440 this.getServerData1();
436 } else { 441 } else {
437 this.getServerData(); 442 this.getServerData();
  443 + // this.shuguan=[];
  444 + // this.page=1;
  445 + // this.get_shuguanchart()
438 } 446 }
439 }, 447 },
440 }, 448 },
@@ -444,20 +452,26 @@ @@ -444,20 +452,26 @@
444 // 获取数管图表数据 452 // 获取数管图表数据
445 this.get_shuguanchart(); 453 this.get_shuguanchart();
446 // 获取剩余可用次数 454 // 获取剩余可用次数
447 - this.get_shenyu()  
448 - } 455 + this.get_shenyu();
  456 + },
  457 + onReachBottom: function() {
  458 + let newpage=this.page;
  459 + newpage++;
  460 + this.page=newpage
  461 + this.get_shuguanchart();
  462 + },
449 } 463 }
450 </script> 464 </script>
451 465
452 466
453 <style> 467 <style>
454 -  
455 - .nodatas{  
456 - color:#7F8389;  
457 - font-size:36rpx; 468 + .nodatas {
  469 + color: #7F8389;
  470 + font-size: 36rpx;
458 margin: 100rpx 0 50rpx; 471 margin: 100rpx 0 50rpx;
459 472
460 } 473 }
  474 +
461 /*样式的width和height一定要与定义的cWidth和cHeight相对应*/ 475 /*样式的width和height一定要与定义的cWidth和cHeight相对应*/
462 .qiun-charts { 476 .qiun-charts {
463 width: 750upx; 477 width: 750upx;
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 99
100 <view v-for="(item,index) in imglist" :key="index" class="imgshang"> 100 <view v-for="(item,index) in imglist" :key="index" class="imgshang">
101 <view class="upload" > 101 <view class="upload" >
102 - <image :src="item"></image> 102 + <image :src="item" @click="viewimgtu(index)"></image>
103 <view class="chahao" @click="del(index)"> 103 <view class="chahao" @click="del(index)">
104 <image src="../../static/img/chahao3.png"></image> 104 <image src="../../static/img/chahao3.png"></image>
105 </view> 105 </view>
@@ -115,9 +115,26 @@ @@ -115,9 +115,26 @@
115 115
116 </view> 116 </view>
117 </view> 117 </view>
  118 +
  119 + <view class="photo" v-else>
  120 + <view class="aboutphoto">相关照片</view>
  121 +
  122 + <view class="imgbox">
  123 +
  124 + <view v-for="(item,index) in imglist" :key="index" class="imgshang">
  125 + <view class="upload" >
  126 + <image :src="item" @click="viewimgtu(index)"></image>
  127 +
  128 + </view>
  129 + </view>
  130 +
  131 +
  132 + </view>
  133 + </view>
118 134
119 - <view class="subshuju" @click="set_number" v-if="fenxiangor">提交数据</view>  
120 - <view class="subshuju" v-else>提交数据</view> 135 + <view class="subshuju" @click="edifenxiangor?set_number:''" v-if="edifenxiangor">提交数据</view>
  136 + <!-- <view class="subshuju" v-else>提交数据</view> -->
  137 +
121 138
122 139
123 140
@@ -145,12 +162,14 @@ @@ -145,12 +162,14 @@
145 number:'', 162 number:'',
146 id:'', 163 id:'',
147 is_share:0, 164 is_share:0,
148 - fenxiangor:true 165 + fenxiangor:true,
  166 + edifenxiangor:true
149 } 167 }
150 }, 168 },
151 methods: { 169 methods: {
152 //选择照片 170 //选择照片
153 shoseimg() { 171 shoseimg() {
  172 + let baseurl=uni.getStorageSync("baseurl")
154 173
155 uni.chooseImage({ 174 uni.chooseImage({
156 count: 1, 175 count: 1,
@@ -170,7 +189,7 @@ @@ -170,7 +189,7 @@
170 } 189 }
171 190
172 uni.uploadFile({ 191 uni.uploadFile({
173 - url: 'https://icr.gangjuren.com/api/person/upload', //仅为示例,非真实的接口地址 192 + url: baseurl+'/api/person/upload',
174 filePath: tempFilePaths[0], 193 filePath: tempFilePaths[0],
175 name: 'images', 194 name: 'images',
176 token: uni.getStorageSync('token'), 195 token: uni.getStorageSync('token'),
@@ -181,6 +200,8 @@ @@ -181,6 +200,8 @@
181 console.log(uploadFileRes); 200 console.log(uploadFileRes);
182 let data = JSON.parse(uploadFileRes.data) 201 let data = JSON.parse(uploadFileRes.data)
183 console.log(data) 202 console.log(data)
  203 +
  204 + console.log('000999888',this.imglist)
184 this.imglist.push(data.data.src) 205 this.imglist.push(data.data.src)
185 } 206 }
186 }); 207 });
@@ -197,6 +218,7 @@ @@ -197,6 +218,7 @@
197 //拍摄照片上传 218 //拍摄照片上传
198 219
199 camera() { 220 camera() {
  221 + let baseurl=uni.getStorageSync("baseurl")
200 uni.chooseImage({ 222 uni.chooseImage({
201 count:1, 223 count:1,
202 sizeType: ['original', 'compressed'], 224 sizeType: ['original', 'compressed'],
@@ -215,7 +237,7 @@ @@ -215,7 +237,7 @@
215 } 237 }
216 238
217 uni.uploadFile({ 239 uni.uploadFile({
218 - url: 'https://icr.gangjuren.com/api/person/upload', //仅为示例,非真实的接口地址 240 + url: baseurl+'/api/person/upload',
219 filePath: tempFilePaths[0], 241 filePath: tempFilePaths[0],
220 name: 'images', 242 name: 'images',
221 token: uni.getStorageSync('token'), 243 token: uni.getStorageSync('token'),
@@ -249,7 +271,8 @@ @@ -249,7 +271,8 @@
249 271
250 } 272 }
251 273
252 - this.imglist=newimglist 274 + this.imglist=newimglist;
  275 + console.log('9999888',this.imglist)
253 }, 276 },
254 277
255 // 获取数管剩余时间次数 278 // 获取数管剩余时间次数
@@ -268,6 +291,16 @@ @@ -268,6 +291,16 @@
268 app.post(url, param, 'post').then(r => { 291 app.post(url, param, 'post').then(r => {
269 console.log(r, "获取数板详情") 292 console.log(r, "获取数板详情")
270 t.equipment_log = r.equipment_log; 293 t.equipment_log = r.equipment_log;
  294 + t.biaoshi=r.equipment_log.biaoshi;
  295 + t.description=r.equipment_log.description;
  296 + t.ziduan1=r.equipment_log.ziduan1;
  297 + t.ziduan2=r.equipment_log.ziduan2;
  298 + t.ziduan3=r.equipment_log.ziduan3;
  299 + t.ziduan4=r.equipment_log.ziduan4;
  300 + t.ziduan5=r.equipment_log.ziduan5;
  301 + t.imglist=r.equipment_log.images
  302 +
  303 +
271 }).catch(err => { 304 }).catch(err => {
272 console.log(err) 305 console.log(err)
273 }) 306 })
@@ -304,28 +337,48 @@ @@ -304,28 +337,48 @@
304 title:'编辑成功', 337 title:'编辑成功',
305 icon:'none' 338 icon:'none'
306 }) 339 })
307 - t.fenxiangor=false 340 + t.edifenxiangor=false
308 }).catch(err => { 341 }).catch(err => {
309 console.log(err) 342 console.log(err)
310 }) 343 })
311 - } 344 + },
  345 + //图片预览
  346 + viewimgtu(index) {
  347 + console.log('999000',index)
  348 +
  349 + uni.previewImage({
  350 + current: this.imglist[index],
  351 + urls: this.imglist,
  352 + success: function(res) {},
  353 + fail: function(res) {},
  354 + complete: function(res) {},
  355 + })
  356 + },
312 357
313 }, 358 },
314 onLoad(options) { 359 onLoad(options) {
  360 +
  361 +
315 console.log('777777',options) 362 console.log('777777',options)
316 this.number=options.number; 363 this.number=options.number;
317 this.id=options.id; 364 this.id=options.id;
318 if(options.type==1){ 365 if(options.type==1){
319 this.is_share=1; 366 this.is_share=1;
320 - this.fenxiangor=false 367 + this.fenxiangor=false;
  368 + this.edifenxiangor=false
321 }else{ 369 }else{
322 this.is_share=0; 370 this.is_share=0;
323 - this.fenxiangor=true 371 + this.fenxiangor=true;
  372 + this.edifenxiangor=true
324 } 373 }
  374 +
  375 + this.get_shubandetail()
325 }, 376 },
  377 +
  378 +
326 onShow() { 379 onShow() {
327 - this.fenxiangor=true  
328 - this.get_shubandetail() 380 +
  381 +
329 }, 382 },
330 onShareAppMessage: function(res) { 383 onShareAppMessage: function(res) {
331 if (res.from === 'button') { 384 if (res.from === 'button') {
@@ -343,6 +396,7 @@ @@ -343,6 +396,7 @@
343 .imgbox{ 396 .imgbox{
344 display:flex; 397 display:flex;
345 align-items: center; 398 align-items: center;
  399 + flex-wrap: wrap;
346 } 400 }
347 .imgshang{ 401 .imgshang{
348 display:flex; 402 display:flex;
@@ -490,7 +544,7 @@ @@ -490,7 +544,7 @@
490 height: 160rpx; 544 height: 160rpx;
491 font-size: 0; 545 font-size: 0;
492 margin-top: 30rpx; 546 margin-top: 30rpx;
493 - margin-left:20rpx; 547 + margin-left:14rpx;
494 position: relative; 548 position: relative;
495 } 549 }
496 .chahao{ 550 .chahao{
@@ -98,11 +98,20 @@ @@ -98,11 +98,20 @@
98 }, 98 },
99 methods: { 99 methods: {
100 shubandetail(e) { 100 shubandetail(e) {
  101 +
101 let that = this; 102 let that = this;
102 - clearInterval(that.interval_number);  
103 - uni.navigateTo({  
104 - url: '/pages/shubandetail/shubandetail?id=' + e.id + '&number=' + this.number  
105 - }) 103 + if(that.is_share==1){
  104 + clearInterval(that.interval_number);
  105 + uni.navigateTo({
  106 + url: '/pages/shubandetail/shubandetail?id=' + e.id + '&number=' + this.number+'&type='+1
  107 + })
  108 + }else{
  109 + clearInterval(that.interval_number);
  110 + uni.navigateTo({
  111 + url: '/pages/shubandetail/shubandetail?id=' + e.id + '&number=' + this.number+'&type='+0
  112 + })
  113 + }
  114 +
106 }, 115 },
107 // 获取当前时间 116 // 获取当前时间
108 get_nowtime() { 117 get_nowtime() {
@@ -104,6 +104,7 @@ @@ -104,6 +104,7 @@
104 //选择照片 104 //选择照片
105 shoseimg() { 105 shoseimg() {
106 let t = this; 106 let t = this;
  107 + let baseurl=uni.getStorageSync("baseurl")
107 uni.chooseImage({ 108 uni.chooseImage({
108 count: 1, 109 count: 1,
109 sizeType: ['original', 'compressed'], 110 sizeType: ['original', 'compressed'],
@@ -174,6 +175,8 @@ @@ -174,6 +175,8 @@
174 // }); 175 // });
175 // } 176 // }
176 // }); 177 // });
  178 +
  179 + let baseurl=uni.getStorageSync("baseurl")
177 180
178 uni.chooseImage({ 181 uni.chooseImage({
179 count: 1, 182 count: 1,
@@ -140,19 +140,26 @@ @@ -140,19 +140,26 @@
140 <view class="writeheng"></view> 140 <view class="writeheng"></view>
141 </view> 141 </view>
142 <view class="guanlistbox"> 142 <view class="guanlistbox">
143 - <view class="guanlist" v-for="(item,index) in log_list" :key="index" @click="fuhe(item.id)"> 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> 144 <view class="guanitem">{{item.type}}</view>
145 <view class="guanitem">{{item.confirmation}}</view> 145 <view class="guanitem">{{item.confirmation}}</view>
146 <view class="guanitem">{{item.distrust}}</view> 146 <view class="guanitem">{{item.distrust}}</view>
147 <view class="guanitem">{{item.fuhe}}</view> 147 <view class="guanitem">{{item.fuhe}}</view>
148 - <view class="write" v-if="fengxiangshare"> 148 + <view class="write" >
149 <image src="/static/img/write.png"></image> 149 <image src="/static/img/write.png"></image>
150 </view> 150 </view>
151 -  
152 - <view class="write" v-else> 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" >
153 <image src="/static/img/write.png"></image> 160 <image src="/static/img/write.png"></image>
154 </view> 161 </view>
155 - </view> 162 + </view> -->
156 <!-- <view class="guanlist"> 163 <!-- <view class="guanlist">
157 <view class="guanitem">DN50</view> 164 <view class="guanitem">DN50</view>
158 <view class="guanitem">5000</view> 165 <view class="guanitem">5000</view>