diff --git a/CustomStartPage/origin.png b/CustomStartPage/origin.png new file mode 100644 index 00000000..9bf6d562 Binary files /dev/null and b/CustomStartPage/origin.png differ diff --git a/CustomStartPage/start-page.9.png b/CustomStartPage/start-page.9.png index 9bf6d562..f0027abd 100644 Binary files a/CustomStartPage/start-page.9.png and b/CustomStartPage/start-page.9.png differ diff --git a/androidPrivacy.json b/androidPrivacy.json index 9c1832cd..2664df59 100755 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -2,13 +2,13 @@ "version": "1", "prompt": "template", "title": "用户协议和隐私政策", - "message": "　　请你务必审慎阅读、充分理解“用户协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《用户协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "message": "　　请你务必审慎阅读、充分理解“用户协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《用户协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", "buttonAccept": "同意并接受", "buttonRefuse": "暂不同意", "hrefLoader": "system|default", "second": { "title": "确认提示", - "message": "　　进入应用前，你需先同意《用户协议》和《隐私政策》，否则将退出应用。", + "message": "　　进入应用前，你需先同意《用户协议》和《隐私政策》，否则将退出应用。", "buttonAccept": "同意并继续", "buttonRefuse": "退出应用" }, diff --git a/components/verification/verification.vue b/components/verification/verification.vue index f015c47c..d9d58d43 100644 --- a/components/verification/verification.vue +++ b/components/verification/verification.vue @@ -1,531 +1,531 @@ - - - - - + + + + + diff --git a/components/vlog/guanzhu.nvue b/components/vlog/guanzhu.nvue index 751bd9c1..42912c64 100644 --- a/components/vlog/guanzhu.nvue +++ b/components/vlog/guanzhu.nvue @@ -637,6 +637,10 @@ export default { return graceNumber(num); }, async likeOrDislikeVlog(item) { + var info = storage.getVlogUserInfo(); + if (info != null) { + this.userId = info.id; + } // 没登录拒绝操作 if (this.userId == '') { uni.navigateTo({ diff --git a/components/vlog/local.nvue b/components/vlog/local.nvue index ef972bd6..3f73fbcb 100644 --- a/components/vlog/local.nvue +++ b/components/vlog/local.nvue @@ -637,6 +637,10 @@ export default { return graceNumber(num); }, async likeOrDislikeVlog(item) { + var info = storage.getVlogUserInfo(); + if (info != null) { + this.userId = info.id; + } // 没登录拒绝操作 if (this.userId == '') { uni.navigateTo({ diff --git a/components/vlog/tuijian.nvue b/components/vlog/tuijian.nvue index 6fc33b04..62d587bf 100644 --- a/components/vlog/tuijian.nvue +++ b/components/vlog/tuijian.nvue @@ -628,6 +628,10 @@ export default { return graceNumber(num); }, async likeOrDislikeVlog(item) { + var info = storage.getVlogUserInfo(); + if (info != null) { + this.userId = info.id; + } // 没登录拒绝操作 if (this.userId == '') { uni.navigateTo({ diff --git a/config/api.js b/config/api.js index 7373c4c0..d97fb1f4 100644 --- a/config/api.js +++ b/config/api.js @@ -9,8 +9,10 @@ const dev = { common: "http://43.143.227.203:8890", buyer: "http://43.143.227.203:8888", vlog: "http://43.143.227.203:8099", + // vlog: "http://192.168.1.86:8099", web: "http://43.143.227.203:8099", seller: "http://43.143.227.203:8889", + }; // 生产环境 const prod = { @@ -19,6 +21,7 @@ const prod = { common: "http://43.143.227.203:8890", buyer: "http://43.143.227.203:8888", vlog: "http://43.143.227.203:8099", + // vlog: "http://192.168.1.86:8099", web: "http://43.143.227.203:8099", seller: "http://43.143.227.203:8889", }; diff --git a/manifest.json b/manifest.json index 11a35d96..d027e88d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "wzj4", + "name": "无终街", "appid": "__UNI__6DB512D", "description": "admin", "versionName": "4.0.0", diff --git a/pages/me/modifyNickname.vue b/pages/me/modifyNickname.vue index 6cbbbcb3..a324f204 100755 --- a/pages/me/modifyNickname.vue +++ b/pages/me/modifyNickname.vue @@ -8,7 +8,7 @@ :value="nickname" :model="nickname" placeholder="请填入昵称~" - maxlength="8" + maxlength="14" @input="typingContent" /> diff --git a/pages/me/vlog.nvue b/pages/me/vlog.nvue index 3bf801c8..3af987ca 100644 --- a/pages/me/vlog.nvue +++ b/pages/me/vlog.nvue @@ -647,6 +647,10 @@ export default { return graceNumber(num); }, async likeOrDislikeVlog(item) { + var info = storage.getVlogUserInfo(); + if (info != null) { + this.userId = info.id; + } // 没登录拒绝操作 if (this.userId == '') { uni.navigateTo({ @@ -768,7 +772,7 @@ export default { if (objData == null) { uni.showToast({ icon: 'none', - title: '视频丢失' + title: '视频审核中' }); return; } @@ -965,7 +969,7 @@ export default { if (objData == null) { uni.showToast({ icon: 'none', - title: '视频丢失' + title: '视频审核中' }); return; } diff --git a/pages/publish/publish.nvue b/pages/publish/publish.nvue index 840e2916..b0583b78 100755 --- a/pages/publish/publish.nvue +++ b/pages/publish/publish.nvue @@ -198,23 +198,27 @@ export default { url: serverUrl + '/vlog/publish', data: vlog, success(result) { - if (result.data.status == 200) { - // uni.showToast({ - // title: result.data.msg, - // icon: 'none', - // duration: 2000 - // }); + console.log(result); + uni.switchTab({ + url: '/pages/me/me' + }); + // if (result.data.status == 200) { + // // uni.showToast({ + // // title: result.data.msg, + // // icon: 'none', + // // duration: 2000 + // // }); - uni.switchTab({ - url: '/pages/me/me' - }); - } else { - uni.showToast({ - title: result.data.msg, - icon: 'none', - duration: 3000 - }); - } + // uni.switchTab({ + // url: '/pages/me/me' + // }); + // } else { + // uni.showToast({ + // title: result.data.msg, + // icon: 'none', + // duration: 3000 + // }); + // } }, complete() { this.upFlage = true; diff --git a/uni_modules/uni-popup/components/uni-popup-comments/uni-popup-comments.vue b/uni_modules/uni-popup/components/uni-popup-comments/uni-popup-comments.vue index 79656bcd..69fc0753 100755 --- a/uni_modules/uni-popup/components/uni-popup-comments/uni-popup-comments.vue +++ b/uni_modules/uni-popup/components/uni-popup-comments/uni-popup-comments.vue @@ -686,6 +686,7 @@ export default { newCommentObject.commentUserFace = myUserInfo.face; newCommentObject.isLike = 0; newCommentObject.vlogerId = userId; + newCommentObject.createTime = new Date().getTime(); me.doCommentPagingList(1, true); diff --git a/utils/request.js b/utils/request.js index e345e36e..66692f6a 100644 --- a/utils/request.js +++ b/utils/request.js @@ -30,7 +30,7 @@ function cleanStorage() { storage.setHasLogin(false); storage.setAccessToken(""); storage.setRefreshToken(""); - storage.setUuid(""); + storage.setUuid("wzj666"); storage.setUserInfo({}); // 清理vlog信息 storage.setVlogToken(""); @@ -66,7 +66,8 @@ let http = new Request(); http.setConfig((config) => { // 没有uuid创建 if (!storage.getUuid()) { - storage.setUuid(uuid.v1()); + // storage.setUuid(uuid.v1()); + storage.setUuid("wzj666"); } /* 设置全局配置 */ @@ -113,7 +114,8 @@ http.interceptors.request.use( } config.header = { ...config.header, - uuid: storage.getUuid() || uuid.v1(), + // uuid: storage.getUuid() || uuid.v1(), + uuid: 'wzj666', }; return config; }, @@ -205,8 +207,7 @@ http.interceptors.response.use( ) { if (response.data.message) { uni.showToast({ - // title: response.data.message, - title: "请重试", + title: response.data.message, icon: "none", duration: 1500, });