|
|
@@ -1571,11 +1571,7 @@ Page({
|
|
|
addressExt: '',
|
|
|
})
|
|
|
this.setData({
|
|
|
-<<<<<<< HEAD
|
|
|
[Info]: '',
|
|
|
-=======
|
|
|
- [Info]: [],
|
|
|
->>>>>>> 4d87d7ac7ab7af3fd116baec7275859e5585ddfb
|
|
|
[Infos]: '',
|
|
|
})
|
|
|
console.log(this.data.oldInfo[this.data.activeIndex].chooseAdressArr1)
|
|
|
@@ -4487,22 +4483,15 @@ Page({
|
|
|
});
|
|
|
},
|
|
|
onLoad(value) {
|
|
|
-<<<<<<< HEAD
|
|
|
- this.huixian1(value.id, value.name);
|
|
|
- this.chooseAdress();
|
|
|
-=======
|
|
|
- console.log(wx.getStorageSync('user'), "打印");
|
|
|
if (wx.getStorageSync('user') == '') {
|
|
|
wx.redirectTo({
|
|
|
url: '/pages/login/login',
|
|
|
})
|
|
|
}else {
|
|
|
console.log(value, "onLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoad");
|
|
|
+ this.chooseAdress();
|
|
|
this.huixian1(value.id, value.name);
|
|
|
}
|
|
|
-
|
|
|
- // this.getSelfLocation();
|
|
|
->>>>>>> 4d87d7ac7ab7af3fd116baec7275859e5585ddfb
|
|
|
},
|
|
|
huixian1(id, name) {
|
|
|
if (id) {
|
|
|
@@ -5178,12 +5167,7 @@ Page({
|
|
|
let mmm = datass.map(item => {
|
|
|
if (item.regularsInfo) {
|
|
|
let partol = this.removeExcess(item.regularsInfo);
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
let partols = this.removeExcess(partol.visitMode);
|
|
|
- console.log(partol, "111111111111111111111");
|
|
|
- console.log(partols, "99999999999999999999");
|
|
|
->>>>>>> 4d87d7ac7ab7af3fd116baec7275859e5585ddfb
|
|
|
return {
|
|
|
visitCount: partol.visitCount,
|
|
|
visitCountExt: partol.visitCountExt,
|
