diff --git a/pages.json b/pages.json
index 822ba7d..e4ada26 100644
--- a/pages.json
+++ b/pages.json
@@ -77,6 +77,15 @@
"enablePullDownRefresh": false,
"navigationStyle":"custom"// 去掉微信小程序顶部导航
}
+ },
+ {
+ "path" : "pages/index/webview",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh": false,
+ "navigationStyle":"custom"// 去掉微信小程序顶部导航
+ }
}
],
"subPackages":[
@@ -203,6 +212,24 @@
"enablePullDownRefresh": false,
"navigationStyle":"custom"// 去掉微信小程序顶部导航
}
+ },
+ {
+ "path" : "recyclebin",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh": false,
+ "navigationStyle":"custom"// 去掉微信小程序顶部导航
+ }
+ },
+ {
+ "path" : "recyclebindetil",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh": false,
+ "navigationStyle":"custom"// 去掉微信小程序顶部导航
+ }
}
]
}
diff --git a/pages/customer/followup.vue b/pages/customer/followup.vue
index d748ecc..ab73918 100644
--- a/pages/customer/followup.vue
+++ b/pages/customer/followup.vue
@@ -282,6 +282,32 @@
});
},
getlocahost(){
+ // 检查定位权限
+ uni.getSetting({
+ success: (res) => {
+ if (!res.authSetting['scope.userLocation']) {
+ // 未授权，请求权限
+ uni.authorize({
+ scope: 'scope.userLocation',
+ success: () => {
+ this.getlocahost();
+ },
+ fail: () => {
+ uni.showToast({
+ title: '定位权限未授权',
+ icon: 'none',
+ });
+ },
+ });
+ } else {
+ // 已授权，直接获取定位
+ this.getlocahost();
+ }
+ },
+ });
+ },
+ getlocahost(){
+
var that = this
uni.getLocation({
type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
@@ -406,7 +432,7 @@
var that = this;
uni.uploadFile({
// url: 'http://api.crm.hnxinyouhe.com/upload',
- url: 'http://219.157.255.213:9007',
+ url: 'http://219.157.255.213:9007/upload/uploadImage',
filePath: imgUrl,
name: 'files',
header:{'content-type': 'application/x-www-form-urlencoded','Authorization': 'Bearer ' + uni.getStorageSync('token')},
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index f9b1c0d..b7c5354 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -7,17 +7,19 @@
-
-
+
+
-
-
- {{userinfo.email}}
-
+
+
+ {{userinfo.name}}
+
-
- ID：{{userinfo.id}}
+
+ ID：{{userinfo.id}}
+
+ {{$t('auth')}}
@@ -32,11 +34,11 @@
-->
-
+
{{$t('mine.contact')}}
@@ -57,6 +59,11 @@
{{$t('mine.logoff')}}
-->
+
{{$t('mine.logout')}}
@@ -84,15 +91,41 @@
data() {
return {
userinfo:'',
- show: false
+ show: false,
+ isopenid:false,
}
},
onLoad() {
- this.userinfo =JSON.parse(uni.getStorageSync('userinfo'))
+ // this.userinfo =JSON.parse(uni.getStorageSync('userinfo'))
+
},
onShow() {
+ this.getuserinfo()
},
methods: {
+ getuserinfo(){
+
+ request({
+ url:'user/getInfo',
+ method:'get',
+ }).then(res => {
+ this.userinfo = res.data.data;
+ if(this.userinfo.feishu_openid&&this.userinfo.feishu_openid!=null&&this.userinfo.feishu_openid!='null'&&this.userinfo.feishu_openid!=''){
+ this.isopenid=true
+ }
+
+ })
+ },
+ gomymp(){
+ uni.navigateTo({
+ url: '/pages/mine/webview'
+ })
+ },
+ gomyauth(){
+ uni.navigateTo({
+ url: '/pages/index/webview'
+ })
+ },
changinfo(){
uni.navigateTo({
url: '/pages/mine/changinfo'
@@ -173,6 +206,7 @@
font-size: 34rpx;
color: white;
.right{
+ flex: 2;
margin-left: 15px;
image{
width: 32rpx;
@@ -182,9 +216,22 @@
view{
line-height: 30px;
}
+ .minemp{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .mp{
+ font-size: 28rpx;
+ background: #fff;
+ color: #3471FF;
+ padding: 1px 15px;
+ border-radius: 5px 15px 15px 15px;
+ }
+ }
.mineid{
font-size: 24rpx;
}
+
}
}
}
diff --git a/pages/index/webview.vue b/pages/index/webview.vue
new file mode 100644
index 0000000..52a617b
--- /dev/null
+++ b/pages/index/webview.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/login/register.vue b/pages/login/register.vue
index e68d832..6c6e412 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -117,6 +117,7 @@
})
},
getVcode() {
+
if(this.email==''){
uni.showToast({
title:this.$t('emailerr'),
diff --git a/pages/mine/changinfo.vue b/pages/mine/changinfo.vue
index 95908f8..099c189 100644
--- a/pages/mine/changinfo.vue
+++ b/pages/mine/changinfo.vue
@@ -3,16 +3,18 @@
-
-
- {{$t('mine.changeavatar')}}
+
+
+
+
+ {{$t('mine.changeavatar')}}
{{$t('gender')}}
-
- {{$t('gender1')}}
- {{$t('gender2')}}
+
+ {{$t('gender1')}}
+ {{$t('gender2')}}
@@ -20,28 +22,53 @@
{{$t('mine.nickname')}}
-
+
{{$t('mine.lxcall')}}
-
+
+ {{$t('mine.position')}}
+
+
+
+
+
+
+
+ {{$t('customer.Company')}}
+
+ {{company_name || $t('inputnl')}}
+
+
+
+
+
+ {{$t('customer.Country')}}
+
+ {{country_name || $t('customer.Countryinput')}}
+
+
+
+
+
diff --git a/pages/mine/recyclebindetil.vue b/pages/mine/recyclebindetil.vue
new file mode 100644
index 0000000..507e842
--- /dev/null
+++ b/pages/mine/recyclebindetil.vue
@@ -0,0 +1,333 @@
+
+
+
+
+
+
+ {{datas.contacts}}
+
+ {{datas.magnitude_txt}}
+
+
+
+
+
+ {{datas.phone}}
+ 渠道：{{datas.channel_name}}
+
+ {{datas.sex_txt}} | {{datas.country_name}}{{datas.car_type_name}}
+
+ Email: {{datas.email}}
+ WhatsAPP: {{datas.WhatsApp}}
+ 公司: {{datas.address}}
+ 备注: {{datas.describe}}
+
+
+
+ {{$t('customer.Cstomerfj')}}
+
+ {{datas.grade_txt || $t('customer.Cstomerfjinput')}}
+
+
+
+
+
+
+
+ {{$t('customer.followrecord')}} {{datas.follow_txt}}
+
+
+
+
+
+
+
+
+ {{$t('times')}} ：{{item.created_at}}
+
+ {{$t('address')}}：{{item.address}}
+ {{$t('customer.Visitcontent')}}：{{item.audio_text}}
+
+
+
+
+
+
+
+ {{$t('times')}}：{{item.created_at}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/mine/resetPwd.vue b/pages/mine/resetPwd.vue
index 73b7422..87c27ee 100644
--- a/pages/mine/resetPwd.vue
+++ b/pages/mine/resetPwd.vue
@@ -1,5 +1,8 @@
+
+
+
@@ -12,6 +15,7 @@
@@ -21,6 +25,7 @@
@@ -29,6 +34,7 @@
@@ -36,6 +42,7 @@
@@ -58,7 +65,9 @@
data() {
return {
email: "",
+ code: "",
password: "",
+ password1: "",
pactChecked: false,
vcodeTime: 0,
vcodeTimer: null
@@ -86,8 +95,38 @@
});
return false
}
+ if(this.password != this.password1){
+ uni.showToast({
+ title:this.$t('passworerr1'),
+ icon: 'none'
+ });
+ return false
+ }
+ request({
+ url:'user/savePassword',
+ method:'POST',
+ data:{
+ email: this.email,
+ password: this.password,
+ code: this.code,
+ }
+ }).then(res => {
+ uni.showToast({
+ title: res.data.message,
+ icon: 'none'
+ });
+ if(res.data.code ==0){
+ uni.clearStorageSync();
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/pages/login/index',// 替换为你要跳转的页面路径
+ });
+ }, 1000);
+ }
+ })
},
getVcode() {
+ console.log(this.email)
if(this.email==''){
uni.showToast({
title:this.$t('emailerr'),
@@ -131,7 +170,14 @@
display: flex;
flex-direction: column;
justify-content: space-between;
-
+ .leftback{
+ position: fixed;
+ /* #ifdef APP-PLUS */
+ top: 44px;
+ /* #endif */
+ top: 30px;
+ left: 15px;
+ }
.title {
padding-top: 220rpx;
text-align: center;