talk
/
talk_appAmin
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重新提交

main
尕宋 2024-06-08 19:06:21 +08:00
parent d870b63731 8bc02eecfe
commit a4e9b1dbe6
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifest.json
View File

@ -1,10 +1,7 @@
{ {
"name" : "若依移动端", "name" : "若依移动端",
<<<<<<< HEAD
"appid" : "__UNI__9F2C9D7", "appid" : "__UNI__9F2C9D7",
=======
"appid" : "__UNI__9285214", "appid" : "__UNI__9285214",
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
"description" : "", "description" : "",
"versionName" : "1.1.0", "versionName" : "1.1.0",
"versionCode" : "100", "versionCode" : "100",

2
pages.json
View File

@ -342,6 +342,4 @@
} }
} }
} }

6
pages/common/postview/index.vue
View File

@ -54,11 +54,11 @@
<!-- 靠左对齐 --> <!-- 靠左对齐 -->
<view class=""> <view class="">
<view class="p-item"> <view class="p-item">
<<<<<<< HEAD
<!-- <image style="width: 40rpx; height: 40rpx;" src="../static/images/icon/tu2-9.png" mode=""></image> --> <!-- <image style="width: 40rpx; height: 40rpx;" src="../static/images/icon/tu2-9.png" mode=""></image> -->
=======
<image style="width: 40rpx; height: 40rpx;" src="../../../static/images/icon/tu2-9.png" mode=""></image> <image style="width: 40rpx; height: 40rpx;" src="../../../static/images/icon/tu2-9.png" mode=""></image>
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
<text class="count">{{ postValue.transmitCount }}</text> <text class="count">{{ postValue.transmitCount }}</text>
</view> </view>
</view> </view>

8
pages/post/postInfo/postInfo.vue
View File

@ -61,7 +61,7 @@
</view> </view>
<!-- 评论区输入框 --> <!-- 评论区输入框 -->
<up-popup :show="showInput" duration="0" @close="close" @open="open" class="comment-po"> <up-popup :show="showInput" duration="0" @close="close" @open="open" class="comment-po">
<view class="flex justifyBetween comment-input" :style="{ marginBottom: bottomVal + 'px' }"> <view class="flex justifyBetween comment-input" :style="{ marginBottom: bottomVal + 26 + 'px' }">
<view class="input-in flex alignCenter justifyCenter"> <view class="input-in flex alignCenter justifyCenter">
<input class="input-in-text" v-if="showInputText" focus="true" maxlength="55" :placeholder="placeholderInput" :adjust-position="false" /> <input class="input-in-text" v-if="showInputText" focus="true" maxlength="55" :placeholder="placeholderInput" :adjust-position="false" />
</view> </view>
@ -521,5 +521,11 @@ page{
.comment-po{ .comment-po{
// height: 500rpx; // height: 500rpx;
} }
.input-bt-text{
font-weight: 400;
font-size: 28rpx;
color: #FFFFFF;
}
</style> </style>

6
permission.js
View File

@ -1,6 +1,6 @@
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
<<<<<<< HEAD
// // 登录页面 // // 登录页面
// const loginPage = "/pages/loginInfo/login"; // const loginPage = "/pages/loginInfo/login";
@ -10,7 +10,7 @@ import { getToken } from "@/utils/auth";
// "/pages/register", // "/pages/register",
// "/pages/common/webview/index", // "/pages/common/webview/index",
// ]; // ];
=======
// 登录页面 // 登录页面
const loginPage = "/pages/login"; const loginPage = "/pages/login";
@ -20,7 +20,7 @@ const whiteList = [
"/pages/register", "/pages/register",
"/pages/common/webview/index", "/pages/common/webview/index",
]; ];
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
// // 检查地址白名单 // // 检查地址白名单
// function checkWhite(url) { // function checkWhite(url) {