mz666
/
apply-assistant-v3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

Browse Source
cyl/master-0819^2
zsk 3 months ago
parent c294d8f643 1e5a475195
commit 88d9086114
8 changed files with 88 additions and 47 deletions
Show Stats Download Patch File Download Diff File

57
components/customTabbar.vue
Unescape Escape View File

@ -57,14 +57,12 @@ export default {
text: "首页",
iconSize: 48,
},
{
iconPath: "icon-message g_c_9",
selectedIconPath: "icon-message g_c_main",
pagePath: "/pages/message/index",
text: "消息",
iconSize: 78,
iconType: "custom",
iconPath: "icon-fadanhao-32 g_c_9",
selectedIconPath: "icon-fadanhao-32 g_c_main",
pagePath: "/pages/home/order",
text: "发单号",
iconSize: 48,
},
{
@ -76,11 +74,12 @@ export default {
count: 0,
},
{
iconPath: "icon-fadanhao-32 g_c_9",
selectedIconPath: "icon-fadanhao-32 g_c_main",
pagePath: "/pages/home/order",
text: "发单号",
iconSize: 48,
iconPath: "icon-message g_c_9",
selectedIconPath: "icon-message g_c_main",
pagePath: "/pages/message/index",
text: "消息",
iconSize: 78,
iconType: "custom",
},
{
iconPath: "icon-user g_c_9",
@ -99,14 +98,7 @@ export default {
text: "首页",
iconSize: 48,
},
{
iconPath: "icon-message g_c_9",
selectedIconPath: "icon-message g_c_main",
pagePath: "/pages/message/index",
text: "消息",
iconSize: 78,
iconType: "custom",
},
{
iconPath: "icon-order_active g_c_9",
selectedIconPath: "icon-order_active g_c_main",
@ -115,6 +107,14 @@ export default {
iconSize: 48,
count: 0,
},
{
iconPath: "icon-message g_c_9",
selectedIconPath: "icon-message g_c_main",
pagePath: "/pages/message/index",
text: "消息",
iconSize: 78,
iconType: "custom",
},
{
iconPath: "icon-user g_c_9",
selectedIconPath: "icon-user g_c_main",
@ -187,14 +187,7 @@ export default {
text: "发单号",
iconSize: 48,
},
{
iconPath: "icon-message g_c_9",
selectedIconPath: "icon-message g_c_main",
pagePath: "/pages/message/index",
text: "消息",
iconSize: 78,
iconType: "custom",
},
{
iconPath: "icon-order_active g_c_9",
selectedIconPath: "icon-order_active g_c_main",
@ -203,6 +196,14 @@ export default {
iconSize: 48,
count: 0,
},
{
iconPath: "icon-message g_c_9",
selectedIconPath: "icon-message g_c_main",
pagePath: "/pages/message/index",
text: "消息",
iconSize: 78,
iconType: "custom",
},
{
iconPath: "icon-user g_c_9",
selectedIconPath: "icon-user g_c_main",

43
main.js
Unescape Escape View File

@ -167,16 +167,55 @@ export function createApp () {
});
}, $sourceType);
},
// 新增方法：生成 UUID
getUUID () {
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
const r = (Math.random() * 16) | 0;
const v = c === "x" ? r : (r & 0x3) | 0x8;
return v.toString(16);
});
},
/**
* 上传到oss
*/
uploadImgToOss (callback = () => { }, type = 'default', $num = 1, $sourceType = ['album', 'camera']) {
var that = this;
G.uploadImage($num, (imgRes) => {
uni.showLoading({
title: '上传中...',
})
G.Get(apiInfo.getOssInfo, {}, (res) => {
console.log('uploadImgToOssresresresres', res);
G.Get(apiInfo.getOssInfo, {}, ({ data }) => {
console.log('uploadImgToOssresresresres', data);
const { policy, signature, accessid, dir, host } = data;
const dataObj = {
policy,
signature,
ossaccessKeyId: accessid,
key: dir + that.getUUID() + "_${filename}",
dir,
host,
};
const formData = new FormData();
formData.append("key", dataObj.key);
formData.append("OSSAccessKeyId", dataObj.ossaccessKeyId);
formData.append("policy", dataObj.policy);
formData.append("Signature", dataObj.signature);
formData.append("success_action_status", "200");
uni.uploadFile({
url: dataObj.host,
method: "post",
filePath: JSON.parse(imgRes)[0],
name: "uploadFile",
header: Object.assign({
Authorization: 'Bearer ' + uni.getStorageSync("apply-token")
}, Ajax.setPublicParams()),
formData: formData,
success: function (res) {
console.log('resresresresresresres', res);
},
fail: function (res) { },
});
})
})
},

9
pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
Unescape Escape View File

@ -9,7 +9,6 @@
props.heihei,
]"
class="u-skeleton"
@touchstart="handleTouchStart"
@touchmove="handleTouchMove"
@click="handleConversationItemClick()"
@ -23,7 +22,6 @@
<Avatar class="u-skeleton-fillet" :account="to" size="48" :avatar="teamAvatar" />
</div>
<div class="conversation-item-right">
<div class="conversation-item-top">
<Appellation class="conversation-item-title u-skeleton-fillet" fontSize="17" v-if="conversation.type === V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P" :account="to" />
<span v-else class="conversation-item-title u-skeleton-fillet">
@ -66,7 +64,7 @@ const props = withDefaults(
conversation: V2NIMConversationForUI;
showMoreActions?: boolean;
loading: boolean;
heihei:""
heihei: "";
}>(),
{ showMoreActions: false }
);
@ -179,9 +177,6 @@ const date = computed(() => {
// console.log(dayjs(props.conversation.lastMessage?.messageRefer.createTime).format('YYYY-MM-DD HH:mm') +"最后一条消息时间 ");
// console.log(dayjs(props.conversation.updateTime).format('YYYY-MM-DD HH:mm') +"更新时间 ");
const time = props.conversation.lastMessage?.messageRefer.createTime || props.conversation.updateTime;
// const time = props.conversation.updateTime;
if (!time) {
@ -297,6 +292,7 @@ $cellHeight: 72px;
position: relative;
transition: transform 0.3s;
background-color: #fff;
padding: 0 10px;
&.show-action-list {
transform: translateX(-200px);
}
@ -347,6 +343,7 @@ $cellHeight: 72px;
padding: 10px 16px;
height: $cellHeight;
box-sizing: border-box;
// background-color: #fff;
}
.conversation-item-left {

2
pages/NEUIKit/pages/Conversation/conversation-list/index.vue
Unescape Escape View File

@ -278,6 +278,8 @@ onUnmounted(() => {
width: 100%;
overflow-y: auto;
overflow-x: hidden;
}
.logo-box {

2
pages/home/order.vue
Unescape Escape View File

@ -59,7 +59,7 @@
</view>
<div class="g_h_10"></div>
<div class="r_box g_ml_10 g_mr_10" style="overflow: hidden">
<view class="item g_flex_row_between g_pl_16 g_pr_16 g_pb_6 g_pt_6 g_bg_f" hover-class="g_bg_e" v-for="(item, index) in query.list" :key="index" @click="goMain(item)" :class="index == 0 ? 'g_pt_12' : ''" :style="{ 'border-bottom': index == query.list.length - 1 ? '1rpx solid #fff' : '1rpx solid #eee' }">
<view class="item g_flex_row_between g_pl_16 g_pr_16 g_pb_6 g_pt_6 g_bg_f" hover-class="g_bg_e" v-for="(item, index) in query.list" :key="index" @click="goMain(item)" :class="index == 0 ? 'g_pt_6 ' : ''" :style="{ 'border-bottom': index == query.list.length - 1 ? '1rpx solid #fff' : '1rpx solid #eee' }">
<view class="g_flex_none g_flex_row_start">
<view class="g_flex_column_center g_pr_16 g_flex_none" style="position: relative">
<g-panel-image :url="item.logo || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/qiyelogo0610.svg'" size="96" radius="50" />

3
pages/message/index.vue
Unescape Escape View File

@ -6,8 +6,9 @@
</view> -->
<!-- - ${isLogin ? tabbarHeight + 43 : 0}px -->
<!-- isLogin ? '43px' : -->
<scroll-view @scroll="getScrollInfo" :scroll-top="resetScroll" :style="{ height: `calc(100vh - ${tabbarHeight})`, 'padding-top': '10px' }" :scroll-y="true" v-if="isLogin">
<scroll-view @scroll="getScrollInfo" :scroll-top="resetScroll" :style="{ minHeight: `calc(100vh - ${tabbarHeight}px)`, 'padding-top': '' }" :scroll-y="true" v-if="isLogin">
<view class="" v-show="current == 0">
<view class="g_h_10"></view>
<view class="g_bg_f">
<ConversationList ref="contactList" />
</view>

4
root/person/avatar.vue
Unescape Escape View File

@ -73,8 +73,8 @@ export default {
},
setAvatar($type) {
let that = this;
// that.G.uploadImgToOss()
// return
that.G.uploadImgToOss()
return
that.G.uploadImg(
(res) => {
console.log("获取数据", res);

7
uni_modules/vk-uview-ui/components/u-icon/u-icon.vue
Unescape Escape View File

@ -291,10 +291,11 @@ export default {
@import "../../iconfont.css";
@font-face {
font-family: "iconfont"; /* Project id 4374774 */
src: url('//at.alicdn.com/t/c/font_4374774_zuuyrxlecbi.woff2?t=1755592111683') format('woff2'),
url('//at.alicdn.com/t/c/font_4374774_zuuyrxlecbi.woff?t=1755592111683') format('woff'),
url('//at.alicdn.com/t/c/font_4374774_zuuyrxlecbi.ttf?t=1755592111683') format('truetype');
src: url('//at.alicdn.com/t/c/font_4374774_pm01bomgppe.woff2?t=1755661995542') format('woff2'),
url('//at.alicdn.com/t/c/font_4374774_pm01bomgppe.woff?t=1755661995542') format('woff'),
url('//at.alicdn.com/t/c/font_4374774_pm01bomgppe.ttf?t=1755661995542') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 24px;

Write Preview
Loading…
Cancel
Save