5.2

androidPrivacy.json

@@ -2,13 +2,13 @@
 	"version": "1",
 	"prompt": "template",
 	"title": "用户协议和隐私政策",
-	"message": "　　请你务必审慎阅读、充分理解“用户协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://www.wzj.net.cn/fuwuxieyi.html\">《用户协议》</a>和<a href=\"http://www.wzj.net.cn/yinsizhengce/342.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+	"message": "　　请你务必审慎阅读、充分理解“用户协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://www.wzj.net.cn/yonhuxieyi.html\">《用户协议》</a>和<a href=\"http://www.wzj.net.cn/yinsizhengce.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
 	"buttonAccept": "同意并接受",
 	"buttonRefuse": "暂不同意",
 	"hrefLoader": "system|default",
 	"second": {
 		"title": "确认提示",
-		"message": "　　进入应用前，你需先同意<a href=\"https://wuzhongjie.com.cn/fuwuxieyi.html\" >《用户协议》</a>和<a href=\"http://wuzhongjie.com.cn/yinsizhengce.html\">《隐私政策》</a>，否则将退出应用。",
+		"message": "　　进入应用前，你需先同意<a href=\"https://wuzhongjie.com.cn/yonhuxieyi.html\" >《用户协议》</a>和<a href=\"http://wuzhongjie.com.cn/yinsizhengce.html\">《隐私政策》</a>，否则将退出应用。",
 		"buttonAccept": "同意并继续",
 		"buttonRefuse": "退出应用"
 	},

components/verification/verification.vue

@@ -24,7 +24,7 @@
 						:style="{
 							height: sliderHeight,
 							width: sliderWidth,
-              'z-index': 101,
+							'z-index': 101
 						}"
 						direction="horizontal"
 					>
@@ -35,7 +35,7 @@
 							:style="{
 								height: sliderHeight,
 								width: sliderWidth,
-                'margin-top': imgbKH,
+								'margin-top': imgbKH
 							}"
 						></image>
 					</movable-view>
@@ -49,13 +49,7 @@
 
 				<movable-area
 					class="flex-row-start"
-          style="
+					style="width: 100%; background-color: #efefef; height: 80rpx; border-radius: 40rpx; margin-top: 30rpx"
-            width: 100%;
-            background-color: #efefef;
-            height: 80rpx;
-            border-radius: 40rpx;
-            margin-top: 30rpx;
-          "
 				>
 					<movable-view
 						scale-value="1"
@@ -63,14 +57,7 @@
 						damping="50"
 						:x="movePv"
 						class="flex-row-center"
-            style="
+						style="border-radius: 50%; height: 100rpx; width: 100rpx; background-color: #ffffff; border: 2rpx solid #e3e3e3; margin-top: -13rpx"
-              border-radius: 50%;
-              height: 100rpx;
-              width: 100rpx;
-              background-color: #ffffff;
-              border: 2rpx solid #e3e3e3;
-              margin-top: -13rpx;
-            "
 						direction="horizontal"
 						@change="moveChange"
 						@touchend="end"
@@ -81,14 +68,25 @@
 							v-if="endLoad"
 							name="arrow-right"
 						></u-icon>
-            <u-icon :color="mainColor" size="40" v-else name="reload"></u-icon>
+						<u-icon
+							:color="mainColor"
+							size="40"
+							v-else
+							name="reload"
+						></u-icon>
 					</movable-view>
 
-          <text style="padding-left: 140rpx" :style="{ color: col }">{{
+					<text
-            hasImg
+						style="padding-left: 140rpx"
-          }}</text>
+						:style="{ color: col }"
+					>
+						{{ hasImg }}
+					</text>
 				</movable-area>
-        <view class="flex-row-around padding-top" style="width: 100%">
+				<view
+					class="flex-row-around padding-top"
+					style="width: 100%"
+				>
 					<u-icon
 						@click="hide"
 						:color="mainColor"
@@ -96,10 +94,18 @@
 						name="close"
 					></u-icon>
 
-          <text class="cu-tag bg-cyan round" @click="getCode">刷新拼图</text>
+					<text
-          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1"
+						class="cu-tag bg-cyan round"
-            >Lili-FRAMEWORK</text
+						@click="getCode"
 					>
+						刷新拼图
+					</text>
+					<text
+						class="my-neirong-sm cuIcon-safe"
+						style="color: #c1c1c1"
+					>
+						Lili-FRAMEWORK
+					</text>
 				</view>
 			</view>
 		</view>
@@ -107,71 +113,71 @@
 </template>
 
 <script>
-import api from "@/config/api.js";
+import api from '@/config/api.js';
-import storage from "@/utils/storage.js";
+import storage from '@/utils/storage.js';
-import uuid from "@/utils/uuid.modified.js";
+import uuid from '@/utils/uuid.modified.js';
 const phone = uni.getSystemInfoSync();
 const l = phone.screenWidth / 750;
 export default {
-  name: "verification",
+	name: 'verification',
 	created() {
 		// 可自行调整
-    this.scHight = phone.screenHeight / 2 - 200 + "px";
+		this.scHight = phone.screenHeight / 2 - 200 + 'px';
 		this.getCode();
 	},
 	props: {
 		height: {
 			type: String,
-      default: "80rpx",
+			default: '80rpx'
 		},
 		width: {
 			type: String,
-      default: "350rpx",
+			default: '350rpx'
 		},
 		left: {
 			type: String,
-      default: "180rpx",
+			default: '180rpx'
 		},
 		top: {
 			type: String,
-      default: "30rpx",
+			default: '30rpx'
 		},
 		business: {
 			type: String,
-      default: "LOGIN",
+			default: 'LOGIN'
-    },
+		}
 	},
 	data() {
 		return {
 			mainColor: this.$mainColor,
 			flage: false,
-      key: "", //key
+			key: '', //key
-      vsrtx: "点击进行验证", //按钮提示语
+			vsrtx: '点击进行验证', //按钮提示语
 			vsr: false, //
 			hid: true,
-      col: "#838383",
+			col: '#838383',
 			movePv: 0,
-      hasImg: "拖动滑块已完成拼图",
+			hasImg: '拖动滑块已完成拼图',
-      spcode: "",
+			spcode: '',
 			tl: 0,
 			moveCode: 0,
 			//X轴移动距离
 			moveX: 0,
 			//模版高度
-      originalHeight: "",
+			originalHeight: '',
 			//模版宽度
-      originalWidth: "",
+			originalWidth: '',
 			//拼图高度
-      sliderHeight: "",
+			sliderHeight: '',
 			//平涂宽度
-      sliderWidth: "",
+			sliderWidth: '',
 			scHight: 0,
 			//原图
-      img: "",
+			img: '',
 			//拼图
-      imgbk: "",
+			imgbk: '',
 			endLoad: true,
-      imgbKH: "",
+			imgbKH: ''
 		};
 	},
 	methods: {
@@ -192,30 +198,31 @@ export default {
 		},
 		// 获取验证图片
 		getCode() {
-      this.col = "#b3afae";
+			this.col = '#b3afae';
-      this.hasImg = "图片加载中...";
+			this.hasImg = '图片加载中...';
 			if (!storage.getUuid()) {
-        storage.setUuid(uuid.v1());
+				// storage.setUuid(uuid.v1());
+				storage.setUuid('wzj666');
 			}
 			uni.request({
-        url: api.common + "/common/slider/" + this.business,
+				url: api.common + '/common/slider/' + this.business,
 				header: {
-          uuid: storage.getUuid(),
+					uuid: storage.getUuid()
 				},
 				success: (res) => {
-          this.col = "#838383";
+					this.col = '#838383';
-          this.hasImg = "拖动滑块以完成拼图";
+					this.hasImg = '拖动滑块以完成拼图';
 					var data = res.data.result;
 
 					// base64的图片
 					this.img = data.backImage;
 					this.imgbk = data.slidingImage;
 					// 根据参数动态适应验证图片的高宽
-          this.imgbKH = data.randomY * 1.8 + "rpx";
+					this.imgbKH = data.randomY * 1.8 + 'rpx';
-          this.originalHeight = data.originalHeight * 1.8 + "rpx";
+					this.originalHeight = data.originalHeight * 1.8 + 'rpx';
-          this.originalWidth = data.originalWidth * 1.8 + "rpx";
+					this.originalWidth = data.originalWidth * 1.8 + 'rpx';
-          this.sliderHeight = data.sliderHeight * 1.8 + "rpx";
+					this.sliderHeight = data.sliderHeight * 1.8 + 'rpx';
-          this.sliderWidth = data.sliderWidth * 1.8 + "rpx";
+					this.sliderWidth = data.sliderWidth * 1.8 + 'rpx';
 					// 适应比率，用来适应滑动距离
 					this.tl = 1 / (1.8 * l);
 					// 无用信息
@@ -223,35 +230,28 @@ export default {
 					// 验证令牌
 					this.key = data.key;
 					this.$store.state.verificationKey = data.key;
-        },
+				}
 			});
 		},
 		end(e) {
 			this.endLoad = false;
 			// 验证拼图位置是否正确
 			uni.request({
-        method: "POST",
+				method: 'POST',
-        url:
+				url: api.common + '/common/slider/' + this.business + '?xPos=' + parseInt(this.moveCode * this.tl),
-          api.common +
-          "/common/slider/" +
-          this.business +
-          "?xPos=" +
-          parseInt(this.moveCode * this.tl),
 				header: {
-          uuid: storage.getUuid(),
+					uuid: storage.getUuid()
 				},
 				success: (res) => {
 					this.endLoad = true;
-          res.data.result == false
+					res.data.result == false ? (res.data.result = false) : (res.data.result = true);
-            ? (res.data.result = false)
-            : (res.data.result = true);
 
 					if (res.data && res.data.result) {
 						//验证成功后把key发送出去,后端会把验证信息存在缓存里
-            this.$emit("send", this.key);
+						this.$emit('send', this.key);
 						this.hide();
 						this.vsr = true;
-            this.vsrtx = "已通过验证";
+						this.vsrtx = '已通过验证';
 					} else {
 						this.getCode(); // 让滑块回到起始位置
 						if (this.movePv == 1) {
@@ -262,22 +262,22 @@ export default {
 					}
 				},
 				fail: (res) => {
-          this.$msg("连接服务器失败");
+					this.$msg('连接服务器失败');
-        },
+				}
 			});
 		},
 		// 绑定拼图位置
 		moveChange(e) {
 			this.moveX = e.detail.x;
 			this.moveCode = e.detail.x;
-    },
+		}
-  },
+	}
 };
 </script>
 
 <style lang="scss" scoped>
-@import "./animation.css";
+@import './animation.css';
-@import "./icon.css";
+@import './icon.css';
 // @import './main.css';
 .dh-wt {
 	animation: at 1.1s ease;

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({

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({

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({

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",
 };

manifest.json

@@ -1,5 +1,5 @@
 {
-	"name": "wzj4",
+	"name": "无终街",
 	"appid": "__UNI__6DB512D",
 	"description": "admin",
 	"versionName": "4.0.0",

pages/me/modifyNickname.vue

@@ -8,7 +8,7 @@
 				:value="nickname"
 				:model="nickname"
 				placeholder="请填入昵称~"
-				maxlength="8"
+				maxlength="14"
 				@input="typingContent"
 			/>
 			<view class="length-cal">

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;
 				}

pages/publish/publish.nvue

@@ -198,23 +198,27 @@ export default {
 				url: serverUrl + '/vlog/publish',
 				data: vlog,
 				success(result) {
-					if (result.data.status == 200) {
+					console.log(result);
-						// uni.showToast({
-						// 	title: result.data.msg,
-						// 	icon: 'none',
-						// 	duration: 2000
-						// });
-
 					uni.switchTab({
 						url: '/pages/me/me'
 					});
-					} else {
+					// if (result.data.status == 200) {
-						uni.showToast({
+					// 	// uni.showToast({
-							title: result.data.msg,
+					// 	// 	title: result.data.msg,
-							icon: 'none',
+					// 	// 	icon: 'none',
-							duration: 3000
+					// 	// 	duration: 2000
-						});
+					// 	// });
-					}
+
+					// 	uni.switchTab({
+					// 		url: '/pages/me/me'
+					// 	});
+					// } else {
+					// 	uni.showToast({
+					// 		title: result.data.msg,
+					// 		icon: 'none',
+					// 		duration: 3000
+					// 	});
+					// }
 				},
 				complete() {
 					this.upFlage = true;

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);
 

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: response.data.message,
-						title: "请重试",
 						icon: "none",
 						duration: 1500,
 					});