From 3f9f627568f3bf6da0f3dd68801f2645094f8245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=83=E8=82=89=E7=9A=84=E9=A5=BA=E5=AD=90?=
<2659004835@qq.com>
Date: Sat, 28 May 2022 13:06:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E5=92=8C=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF=E3=80=81?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=B1=8F=E5=B9=BF=E5=91=8A=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E6=97=B6=E9=97=B46-->3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/guide-page/guide-page.vue | 5 ++--
pagesA/dataQuery/details.vue | 50 ++++++++++++++++++++-------------
2 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/pages/guide-page/guide-page.vue b/pages/guide-page/guide-page.vue
index 7728006..e1f05ce 100644
--- a/pages/guide-page/guide-page.vue
+++ b/pages/guide-page/guide-page.vue
@@ -1,6 +1,6 @@
-
+
@@ -9,6 +9,7 @@
data() {
return {
windowHeight:uni.getSystemInfoSync().windowHeight,
+ // ad_img:'/static/public/icon-guide.png',
ad_img:''
}
},
@@ -52,7 +53,7 @@
'/pages/login/login',
'/pages/tabbar/pagehome/pagehome'
]
- setTimeout(()=>{uni.reLaunch({url:arr[index]})},6000)
+ setTimeout(()=>{uni.reLaunch({url:arr[index]})},3000)
}
}
}
diff --git a/pagesA/dataQuery/details.vue b/pagesA/dataQuery/details.vue
index f118743..8f08c19 100644
--- a/pagesA/dataQuery/details.vue
+++ b/pagesA/dataQuery/details.vue
@@ -26,31 +26,31 @@
- 客户名称：长沙警校
+ 客户名称：{{dataObj.customerName}}
- 客户编号：xxxxxxxxx
+ 客户编号：{{dataObj.customerCode}}
- 客户等级：VIP1
+ 客户等级：{{dataObj.customerVIP}}
- 所属行业：安防
+ 所属行业：{{dataObj.industryInvolved}}
- 客户类型：xxxx
+ 客户类型：{{dataObj.customerType}}
- 入库时间：2022.3.1
+ 入库时间：{{dataObj.warehouseTime}}
- 项目数量：50
+ 项目数量：{{dataObj.projectNum}}
- 所属区域：长沙
+ 所属区域：{{dataObj.area}}
- 详细地址：长沙xxxxx
+ 详细地址：{{dataObj.address}}
@@ -63,28 +63,28 @@
- 姓名：Eveal
+ 姓名：{{concatObj.name}}
- 所属部门：产品研发部
+ 所属部门：{{concatObj.department}}
- 职务：经理
+ 职务：{{concatObj.job}}
- 电话：154751787
+ 电话：{{concatObj.phone}}
- 微信：14250
+ 微信：{{concatObj.wx}}
- qq：9090000
+ qq：{{concatObj.qq}}
- 邮箱：1216311@qq.com
+ 邮箱：{{concatObj.email}}
- 负责时间段：xxxxx
+ 负责时间段：{{concatObj.time}}
@@ -147,7 +147,7 @@
},
data() {
return {
- dataArr:{
+ dataObj:{
customerName:"长沙警校",
customerCode:"xxxxxxxxx",
customerVIP:"VIP1",
@@ -155,9 +155,19 @@
customerType:"xxxx",
warehouseTime:"2022.3.1" ,
projectNum:"50",
- area:"长沙",
-
+ area:"成华区",
+ address:'四川省成都市成华区双店路B口'
},
+ concatObj:{
+ name:'Eveal',
+ department:'产品研发部',
+ job:'职务',
+ phone:'17366921088',
+ wx:'1234987',
+ qq:'1209384',
+ email:'234@qq.com',
+ time:'2022-02-02'
+ },
clientId:'',//客户id
yearArr:[],//年份
currentyear: '',//当前年份
From 6bfc7d50fd09ff93e23e83892279654e643e3b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=83=E8=82=89=E7=9A=84=E9=A5=BA=E5=AD=90?=
<2659004835@qq.com>
Date: Sat, 28 May 2022 13:42:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=95=E5=AF=BC?=
=?UTF-8?q?=E9=A1=B5=E5=8F=AF=E6=89=8B=E5=8A=A8=E5=85=B3=E9=97=AD=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/guide-page/guide-page.vue | 39 ++++++++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/pages/guide-page/guide-page.vue b/pages/guide-page/guide-page.vue
index e1f05ce..e38c2f5 100644
--- a/pages/guide-page/guide-page.vue
+++ b/pages/guide-page/guide-page.vue
@@ -1,6 +1,7 @@
+ {{count}} 关闭
@@ -9,8 +10,14 @@
data() {
return {
windowHeight:uni.getSystemInfoSync().windowHeight,
+ statuHeigh:uni.getSystemInfoSync().statusBarHeight,
// ad_img:'/static/public/icon-guide.png',
- ad_img:''
+ ad_img:'',
+ count:6,//右上角倒计时数
+ timeNum:6000,//页面延迟跳转秒
+ countTimer:null,//控制右上角倒计时事件
+ timeNumTimer:null,//控制页面延迟跳转事件
+ omg:0//判断是否已经登录过0：未登录 1：登录过
}
},
onLoad() {
@@ -18,11 +25,25 @@
this.$requst.get('/universal/api.other/advertise').then(res=>{
if(res.code) {
this.ad_img = res.data.ad_img;
- uni.setStorageSync('adImg',this.ad_img);
+ this.countTimer = setInterval(()=>{
+ if(this.count >= 1){
+ this.count--
+ }
+ },1000)
+ this.timeNumTimer = setTimeout(()=>{
+ this.goPage();
+ },this.timeNum)
+ // uni.setStorageSync('adImg',this.ad_img);
}
})
},
methods: {
+ // 关闭事件
+ closeEv(){
+ clearInterval(this.countTimer);
+ clearTimeout(this.timeNumTimer);
+ this.goPage();
+ },
checkContext(){
if(uni.getStorageSync('password')) {
// 是否登录过，登录过就直接刷新token重新登录
@@ -42,18 +63,18 @@
this.$toolAll.tools.showToast(res.msg);
}
})
- this.goPage(1);
+ this.omg = 1;
} else {
- this.goPage(0);
+ this.omg = 0;
}
},
// 跳转页面
- goPage(index) {
+ goPage() {
let arr = [
'/pages/login/login',
'/pages/tabbar/pagehome/pagehome'
]
- setTimeout(()=>{uni.reLaunch({url:arr[index]})},3000)
+ uni.reLaunch({url:arr[this.omg]})
}
}
}
@@ -61,4 +82,10 @@