diff --git a/App.vue b/App.vue
index e0fdcc0f..227e24ba 100644
--- a/App.vue
+++ b/App.vue
@@ -95,43 +95,42 @@ export default {
},
methods: {
onRequestPermissionListener() {
- this.permissionListener = uni.createRequestPermissionListener();
- this.permissionListener.onRequest(async (e) => {
- console.log(e);
- if (this.flag) {
- return;
- }
- this.flag = true;
- console.log('权限-1', e);
- var item = e[0];
- const { isSuc, msg } = await requestPermissions({
- title: PermissionTips[item].title, // 申请权限时弹出框标题
- content: PermissionTips[item].content, // 申请权限时弹出框内容
- permissionID: item // 权限ID
- });
- console.log(msg);
- if (!isSuc) {
- if (msg != 'close') {
- this.popupView = showModal({
- title: PermissionTips[item].title, // 申请权限时弹出框标题
- content: PermissionTips[item].content, // 申请权限时弹出框内容
- permissionID: item // 权限ID
- });
- } else {
- console.log('用户永久拒绝');
- }
- }
- });
- this.permissionListener.onComplete((e) => {
- console.log('权限-2', e);
- if (this.popupView) {
- this.popupView.close();
- }
- setTimeout(() => {
- this.flag = false;
- }, 5000);
- });
-
+ // this.permissionListener = uni.createRequestPermissionListener();
+ // this.permissionListener.onRequest(async (e) => {
+ // console.log(e);
+ // if (this.flag) {
+ // return;
+ // }
+ // this.flag = true;
+ // console.log('权限-1', e);
+ // var item = e[0];
+ // const { isSuc, msg } = await requestPermissions({
+ // title: PermissionTips[item].title, // 申请权限时弹出框标题
+ // content: PermissionTips[item].content, // 申请权限时弹出框内容
+ // permissionID: item // 权限ID
+ // });
+ // console.log(msg);
+ // if (!isSuc) {
+ // if (msg != 'close') {
+ // this.popupView = showModal({
+ // title: PermissionTips[item].title, // 申请权限时弹出框标题
+ // content: PermissionTips[item].content, // 申请权限时弹出框内容
+ // permissionID: item // 权限ID
+ // });
+ // } else {
+ // console.log('用户永久拒绝');
+ // }
+ // }
+ // });
+ // this.permissionListener.onComplete((e) => {
+ // console.log('权限-2', e);
+ // if (this.popupView) {
+ // this.popupView.close();
+ // }
+ // setTimeout(() => {
+ // this.flag = false;
+ // }, 5000);
+ // });
// #ifndef APP-HARMONY
// 权限监听申请
// 为应用市场审核时要求:APP在调用终端权限时,应同步告知用户申请该权限的目的。此时即可使用本API,在app.vue里全局监听。
@@ -175,9 +174,7 @@ export default {
// });
// }
// #endif
-
// 权限检测成功则返回 { isSuc : true} ,未授权则弹出权限询问弹窗以及权限说明窗口
-
// if (!isSuc) {
// return false
// }
@@ -393,4 +390,4 @@ body {
// height: 100% ;
// overflow: hidden;
// }
-
+
\ No newline at end of file
diff --git a/components/vlog/guanzhu.nvue b/components/vlog/guanzhu.nvue
index 4a60afd6..e99ffcb2 100644
--- a/components/vlog/guanzhu.nvue
+++ b/components/vlog/guanzhu.nvue
@@ -1005,7 +1005,7 @@ export default {
tozuozhe(userId) {
var myInfo = storage.getVlogUserInfo();
var myId = '';
- if (myId != null) {
+ if (myInfo != null) {
myId = myInfo.id;
}
if (userId == myId) {
diff --git a/components/vlog/local.nvue b/components/vlog/local.nvue
index 16f54029..1953a050 100644
--- a/components/vlog/local.nvue
+++ b/components/vlog/local.nvue
@@ -869,7 +869,12 @@ export default {
if (myUserInfo != null) {
userId = myUserInfo.id;
}
- const res = await vlogList(this.page, 10, userId);
+ let cityCode = storage.getCityCode();
+ if (cityCode == '') {
+ this.noData = '获取位置信息失败';
+ return;
+ }
+ const res = await vlogList(this.page, 10, userId, cityCode);
console.log(res);
if (res.data.status == 200) {
var msg = res.data.data.rows;
@@ -1011,7 +1016,7 @@ export default {
tozuozhe(userId) {
var myInfo = storage.getVlogUserInfo();
var myId = '';
- if (myId != null) {
+ if (myInfo != null) {
myId = myInfo.id;
}
if (userId == myId) {
diff --git a/config/api.js b/config/api.js
index 67ba138c..b2052c34 100644
--- a/config/api.js
+++ b/config/api.js
@@ -25,7 +25,7 @@ const dev = {
const prod = {
// common: "http://192.168.1.40:8890",
// buyer: "http://192.168.1.40:8888",
- // vlog: "http://192.168.1.40:8099",
+ // vlog: "http://192.168.1.7:8099",
// web: "http://192.168.1.40:8099",
// seller: "http://192.168.1.40:8889",
diff --git a/pages/mine/share.vue b/pages/mine/share.vue
index b9feb866..fce9b502 100644
--- a/pages/mine/share.vue
+++ b/pages/mine/share.vue
@@ -1,43 +1,43 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+