Compare commits

...

2 Commits

Author SHA1 Message Date
sx 32003e8f29 Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp
# Conflicts:
#	jiuyi2/common/js/config.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_modules_group-module__js.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_modules_group-module__js.js.map
#	jiuyi2/unpackage/dist/cache/.vite/deps/_metadata.json
#	jiuyi2/unpackage/dist/cache/.vite/deps/crypto-js.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/crypto-js.js.map
#	jiuyi2/unpackage/dist/cache/.vite/deps/tim-upload-plugin.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/tim-upload-plugin.js.map
#	jiuyi2/vite.config.js
2025-02-17 19:42:26 +08:00
lr c1e32ecc20 修改聊天记录头像不一致 2025-02-16 22:34:16 +08:00
22 changed files with 1363 additions and 1166 deletions

View File

@ -217,6 +217,17 @@ export const news = {
method: 'GET' method: 'GET'
}) })
}, },
// 客服发消息
sendCusomterService(param) {
return util.request({
url: `/user/chat/sendMsgToPlatformService`,
query: param.query,
data: param.data,
method: 'POST',
})
},
} }
export default news export default news

View File

@ -437,6 +437,18 @@ const shop = {
method: 'GET', method: 'GET',
}) })
}, },
/**
* 获取店铺客服信息
* @param {Object} param
*/
getCustomerService(param) {
return util.request({
url: `/user/MCustomerService/random`,
method: 'GET',
query: param,
})
},
} }
export default shop export default shop

View File

@ -213,7 +213,7 @@ const util = {
responseType: params.responseType || 'text', responseType: params.responseType || 'text',
// 请求成功返回 // 请求成功返回
success: res => { success: res => {
// console.log('request success', url, res, params.data ? params.data : '') console.log('request success', url, res, params.data ? params.data : '')
// 关闭加载效果 // 关闭加载效果
if (params.load) { if (params.load) {
uni.hideLoading() uni.hideLoading()

View File

@ -1,42 +1,42 @@
<script setup> <script setup>
// //
import { import {
ref, ref,
reactive, reactive,
getCurrentInstance, getCurrentInstance,
computed, computed,
defineEmits, defineEmits,
onMounted onMounted
} from 'vue' } from 'vue'
// //
import util from '@/common/js/util.js' import util from '@/common/js/util.js'
// //
import api from '@/api/index.js' import api from '@/api/index.js'
// //
import { import {
useStore useStore
} from 'vuex' } from 'vuex'
const { const {
proxy proxy
} = getCurrentInstance() } = getCurrentInstance()
// //
const store = useStore() const store = useStore()
// //
const props = defineProps({ const props = defineProps({
// //
detail: { detail: {
type: Object, type: Object,
default: () => ({}) default: () => ({})
}, },
}) })
// //
const emit = defineEmits(['update', 'buy']) const emit = defineEmits(['update', 'buy'])
// //
const userinfo = computed(() => store.state.userinfo) const userinfo = computed(() => store.state.userinfo)
// //
function handleCollect() { function handleCollect() {
util.isLogin().then(rs => { util.isLogin().then(rs => {
// //
api.shop.addProductCollect({ api.shop.addProductCollect({
@ -45,7 +45,7 @@
type: { type: {
0: 1, 0: 1,
1: 0, 1: 0,
} [props.detail.isCollect] }[props.detail.isCollect]
} }
}).then(rs => { }).then(rs => {
if (rs.code == 200) { if (rs.code == 200) {
@ -53,7 +53,7 @@
props.detail.isCollect = { props.detail.isCollect = {
0: 1, 0: 1,
1: 0, 1: 0,
} [props.detail.isCollect] }[props.detail.isCollect]
// //
props.detail.collectNumber = rs.data props.detail.collectNumber = rs.data
return return
@ -69,22 +69,53 @@
url: '/pages/login/loginPhone' url: '/pages/login/loginPhone'
}) })
}) })
} }
/** /**
* 跳转 * 跳转
* @param {Object} url 跳转路径 * @param {Object} url 跳转路径
*/ */
function link(url) { function link(url) {
uni.navigateTo({ uni.navigateTo({
url, url,
}) })
} }
// //
function handleBuy() { function handleBuy() {
emit('buy') emit('buy')
}
//
function toCustomer() {
api.shop.getCustomerService({ merchantId: props.detail.merId }).then(rs => {
console.log(rs);
//
if (rs.code == 200) {
} else {
util.alert(rs.msg)
} }
})
let param = {};
param.type = 'C2C'
param.name = `${props.detail.merName}`
param.msgId = `${props.detail.merId}`
param.isCustomer = true
util.toChat(param)
uni.navigateTo({
url: util.setUrl('/pages/news/chat/chat', param)
})
}
</script> </script>
<template> <template>
@ -107,10 +138,10 @@
</view> </view>
</view> </view>
<view class="option ver " v-if="0"> <!-- <view class="option ver" @click="toCustomer">
<image class="wh30" src="/static/customer-service.png" mode="aspectFit" /> <image class="wh30" src="/static/customer-service.png" mode="aspectFit" />
<text class="text mt10">客服</text> <text class="text mt10">客服</text>
</view> </view> -->
</view> </view>
<!-- 下单 --> <!-- 下单 -->
@ -121,8 +152,8 @@
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
// //
.footerMneu { .footerMneu {
// //
.option { .option {
@ -133,5 +164,5 @@
font-size: 24rpx; font-size: 24rpx;
} }
} }
} }
</style> </style>

View File

@ -1,6 +1,5 @@
{ {
"pages": [ "pages": [
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
@ -92,12 +91,24 @@
"navigationBarTitleText": "问答页" "navigationBarTitleText": "问答页"
} }
}, },
{
"path": "pages/news/chat/customeChat",
"style": {
"navigationBarTitleText": "客服聊天"
}
},
{ {
"path": "pages/news/red-envelope/index", "path": "pages/news/red-envelope/index",
"style": { "style": {
"navigationBarTitleText": "红包详情" "navigationBarTitleText": "红包详情"
} }
}, },
{
"path": "pages/news/goodsList/index",
"style": {
"navigationBarTitleText": "商品列表"
}
},
{ {
"path": "pages/mine/mine", "path": "pages/mine/mine",
"style": { "style": {
@ -219,7 +230,6 @@
"navigationBarTitleText": "我的分享" "navigationBarTitleText": "我的分享"
} }
}, },
{ {
"path": "pages/index/deal", "path": "pages/index/deal",
"style": { "style": {
@ -744,10 +754,11 @@
} }
} }
], ],
"subPackages": [
"subPackages": [{ {
"root": "TUIKit", "root": "TUIKit",
"pages": [{ "pages": [
{
"path": "components/TUIConversation/index", "path": "components/TUIConversation/index",
"style": { "style": {
"navigationBarTitleText": "消息" "navigationBarTitleText": "消息"
@ -791,10 +802,11 @@
} }
} }
] ]
}], }
],
"tabBar": { "tabBar": {
"list": [{ "list": [
{
"text": "视频", "text": "视频",
"pagePath": "pages/index/index" "pagePath": "pages/index/index"
}, },
@ -816,7 +828,6 @@
} }
] ]
}, },
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "九亿", "navigationBarTitleText": "九亿",
@ -826,14 +837,14 @@
"bounce": "none" // "bounce": "none" //
} }
}, },
"condition": { "condition": {
"current": 0, "current": 0,
"list": [{ "list": [
{
"name": "test", "name": "test",
"path": "pages/index/index" "path": "pages/index/index"
}] }
]
}, },
"uniIdRouter": {} "uniIdRouter": {}
} }

View File

@ -187,14 +187,14 @@
proxy.$refs.menuRef.close() proxy.$refs.menuRef.close()
// //
util.logout(() => { util.logout(() => {
// #ifdef APP
plus.runtime.restart()
// #endif
api.login.logout({ api.login.logout({
query: { query: {
phoneNumber: userinfo.phoneNumber, phoneNumber: userinfo.phoneNumber,
} }
}).then(rs => {}) }).then(rs => {})
// #ifdef APP
plus.runtime.restart()
// #endif
}) })
}) })
} }

View File

@ -1,10 +1,10 @@
<script setup> <script setup>
/** /**
* 聊天页面 * 聊天页面
*/ */
// //
import TencentCloudChat from '@tencentcloud/chat'; import TencentCloudChat from '@tencentcloud/chat';
import { import {
ref, ref,
reactive, reactive,
nextTick, nextTick,
@ -13,78 +13,80 @@
computed, computed,
getCurrentInstance, getCurrentInstance,
watch, watch,
} from 'vue' } from 'vue'
// api // api
import api from '@/api/index.js' import api from '@/api/index.js'
// //
import util from '@/common/js/util.js' import util from '@/common/js/util.js'
import { import {
onLoad, onLoad,
onReady, onReady,
onPageScroll, onPageScroll,
onUnload onUnload
} from "@dcloudio/uni-app" } from "@dcloudio/uni-app"
// //
import newsTemplate from './components/news-temp' import newsTemplate from './components/news-temp'
// //
import emoji from './emoji.vue' import emoji from './emoji.vue'
// //
import JyVoice from './jy-voice.vue' import JyVoice from './jy-voice.vue'
// //
import JyPlus from './jy-plus.vue' import JyPlus from './jy-plus.vue'
import { import {
useStore useStore
} from 'vuex' } from 'vuex'
const { const {
proxy proxy
} = getCurrentInstance() } = getCurrentInstance()
const store = useStore() const store = useStore()
// //
const msg = reactive({ const msg = reactive({
// //
id: '', id: '',
// C2C GROUP // C2C GROUP
type: '', type: '',
// //
num: '', num: '',
}) //
// isCustomer: false,
const content = ref('') })
// //
const loading = ref(false) const content = ref('')
// //
const userinfo = computed(() => { const loading = ref(false)
//
const userinfo = computed(() => {
let result = store.state.userinfo let result = store.state.userinfo
return result return result
}) })
// //
const list = reactive({ const list = reactive({
// //
limit: 20, limit: 20,
// //
data: [], data: [],
// //
total: 0, total: 0,
}) })
// //
const top = ref(0) const top = ref(0)
// //
const toolHeight = ref(0) const toolHeight = ref(0)
// //
const messageItem = ref({}) const messageItem = ref({})
// voice input emoji plus // voice input emoji plus
const toolStatus = ref('input') const toolStatus = ref('input')
// video // video
const videoUrl = ref('') const videoUrl = ref('')
// //
const videoContext = ref(null) const videoContext = ref(null)
// //
const redPacket = reactive({}) const redPacket = reactive({})
onLoad(option => { onLoad(option => {
// //
let title = '' let title = ''
// //
@ -102,6 +104,9 @@
if (title) uni.setNavigationBarTitle({ if (title) uni.setNavigationBarTitle({
title, title,
}) })
//
if (option.isCustomer) msg.isCustomer = option.isCustomer
// //
addListener() addListener()
// //
@ -116,30 +121,30 @@
}) })
}) })
// #endif // #endif
}) })
onReady(() => { onReady(() => {
uni.createSelectorQuery().in(proxy).select('#tool').boundingClientRect((rect) => { uni.createSelectorQuery().in(proxy).select('#tool').boundingClientRect((rect) => {
toolHeight.value = rect.height toolHeight.value = rect.height
}).exec(); }).exec();
// //
videoContext.value = uni.createVideoContext('video') videoContext.value = uni.createVideoContext('video')
}) })
onPageScroll((ev) => { onPageScroll((ev) => {
onContentScroll(ev) onContentScroll(ev)
}) })
onUnload(() => { onUnload(() => {
// #ifdef APP // #ifdef APP
uni.offKeyboardHeightChange(() => {}) uni.offKeyboardHeightChange(() => { })
// #endif // #endif
videoContext.value.stop() videoContext.value.stop()
}) })
// //
function addListener() { function addListener() {
let onMessageReceived = function(event) { let onMessageReceived = function (event) {
console.log('TencentCloudChat.EVENT.MESSAGE_RECEIVED', event) console.log('TencentCloudChat.EVENT.MESSAGE_RECEIVED', event)
setTimeout(() => { setTimeout(() => {
// //
@ -151,32 +156,32 @@
} }
uni.$chat.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED, onMessageReceived); uni.$chat.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED, onMessageReceived);
} }
// //
function removeListener() { function removeListener() {
uni.$chat.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED); uni.$chat.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED);
} }
// //
function getMoreHistroy() { function getMoreHistroy() {
// //
if (list.total <= list.data.length) return if (list.total <= list.data.length) return
getHistory({ getHistory({
msgId: list.data[0].id msgId: list.data[0].id
}) })
} }
/** /**
* 获取历史记录 * 获取历史记录
* @param {Object} param * @param {Object} param
*/ */
function getHistory(param = {}) { function getHistory(param = {}) {
// sdk // sdk
let isReady = uni.$chat.isReady(); let isReady = uni.$chat.isReady();
// //
if (!isReady && userinfo.value.id) { if (!isReady && userinfo.value.id) {
setTimeout(function() { setTimeout(function () {
getHistory(param) getHistory(param)
}, 200); }, 200);
return return
@ -233,10 +238,10 @@
}).finally(() => { }).finally(() => {
loading.value = false loading.value = false
}) })
} }
// //
function scrollToBottom() { function scrollToBottom() {
uni.createSelectorQuery().in(proxy).select('#scroll-content').boundingClientRect((res) => { uni.createSelectorQuery().in(proxy).select('#scroll-content').boundingClientRect((res) => {
top.value = res.height top.value = res.height
@ -246,29 +251,29 @@
}) })
// console.log('top.value', top.value) // console.log('top.value', top.value)
}).exec(); }).exec();
} }
// //
function debounce(func, wait = 500) { function debounce(func, wait = 500) {
let timeout = null; let timeout = null;
return function(...args) { return function (...args) {
clearTimeout(timeout) clearTimeout(timeout)
timeout = setTimeout(() => { timeout = setTimeout(() => {
func.apply(this, args) func.apply(this, args)
}, wait); }, wait);
} }
} }
// //
function onContentScroll(ev) { function onContentScroll(ev) {
if (ev.scrollTop == 50) getMoreHistroy() if (ev.scrollTop == 50) getMoreHistroy()
debounce(() => { debounce(() => {
top.value = ev.detail.scrollTop top.value = ev.detail.scrollTop
}) })
} }
// //
function handleSend() { function handleSend() {
// //
sendMsg({ sendMsg({
query: { query: {
@ -284,25 +289,27 @@
content.value = '' content.value = ''
} }
}) })
} }
/** /**
* 加号菜单发送 * 加号菜单发送
* @param {Object} message 消息对象 * @param {Object} message 消息对象
*/ */
function handlePlusSend(message) { function handlePlusSend(message) {
sendMsg(message) sendMsg(message)
} }
/** /**
* 发送消息 * 发送消息
* @param {Object} param * @param {Object} param
*/ */
function sendMsg(param) { function sendMsg(param) {
// //
let request = api.news.sendUserMsg let request = api.news.sendUserMsg
// //
if (msg.type == 'GROUP') request = api.news.sendGroupMsg if (msg.type == 'GROUP') request = api.news.sendGroupMsg
if (msg.isCustomer) request = api.news.sendCusomterService
// //
request({ request({
query: param.query, query: param.query,
@ -319,13 +326,13 @@
}).catch((rs) => { }).catch((rs) => {
console.log('sendMsg error:', rs); console.log('sendMsg error:', rs);
}) })
} }
/** /**
* 打开红包详情 * 打开红包详情
* @param {Object} ev * @param {Object} ev
*/ */
function handleRedPacket(ev) { function handleRedPacket(ev) {
messageItem.value = ev messageItem.value = ev
api.news.getRedPacketInfo({ api.news.getRedPacketInfo({
query: { query: {
@ -343,10 +350,10 @@
showCancel: false, showCancel: false,
}) })
}) })
} }
// //
function handleOpenReadPacket() { function handleOpenReadPacket() {
// //
if (redPacket.redStatus == false) return if (redPacket.redStatus == false) return
// //
@ -364,7 +371,7 @@
sendType: { sendType: {
'C2C': '1', 'C2C': '1',
'GROUP': '2', 'GROUP': '2',
} [msg.type], }[msg.type],
} }
}).then(rs => { }).then(rs => {
if (rs.code == 200) { if (rs.code == 200) {
@ -379,73 +386,73 @@
showCancel: false, showCancel: false,
}) })
}) })
} }
// emoji // emoji
function emojiTap(val) { function emojiTap(val) {
content.value = content.value + val content.value = content.value + val
} }
// //
function handleTool(val) { function handleTool(val) {
if (toolStatus.value === val) { if (toolStatus.value === val) {
toolStatus.value = 'input' toolStatus.value = 'input'
return return
} }
toolStatus.value = val toolStatus.value = val
} }
// //
function onFocus() { function onFocus() {
handleTool('input') handleTool('input')
} }
// //
function voiceSend(message) { function voiceSend(message) {
console.log('handlePlusSend', message) console.log('handlePlusSend', message)
sendMsg({ sendMsg({
message, message,
}) })
} }
// //
const handleScroll = (e) => { const handleScroll = (e) => {
if (e.detail.scrollTop === 0) { if (e.detail.scrollTop === 0) {
getHistory() getHistory()
} }
} }
// //
const showGhost = ref(false) const showGhost = ref(false)
// //
const ghostBox = ref({ const ghostBox = ref({
height: '0px', height: '0px',
duration: '0.25s' duration: '0.25s'
}) })
// //
function keyboardheightchange(res) { function keyboardheightchange(res) {
ghostBox.value = res.detail ghostBox.value = res.detail
nextTick(() => { nextTick(() => {
showGhost.value = res.detail.height > 0 ? true : false showGhost.value = res.detail.height > 0 ? true : false
}) })
} }
/** /**
* 看视频 * 看视频
* @param {Object} item 聊天消息对象 * @param {Object} item 聊天消息对象
*/ */
function handleViewVideo(item) { function handleViewVideo(item) {
videoUrl.value = item.payload.videoUrl videoUrl.value = item.payload.videoUrl
// //
videoContext.value.requestFullScreen() videoContext.value.requestFullScreen()
} }
// //
function onScreenChange(ev) { function onScreenChange(ev) {
console.log('onScreenChange', ev) console.log('onScreenChange', ev)
if (!ev.fullScreen) videoContext.value.pause() if (!ev.fullScreen) videoContext.value.pause()
} }
</script> </script>
<template> <template>
@ -458,8 +465,11 @@
<view class="message" <view class="message"
:class="[(item.From_Account || item.fromId) == userinfo.id ? 'self' : 'friend']"> :class="[(item.From_Account || item.fromId) == userinfo.id ? 'self' : 'friend']">
<!-- 如果是我自己 --> <!-- 如果是我自己 -->
<view> <view v-if="msg.type == 'C2C'">
<image :src="item.callbackData.from_url" class="avatar wh80" mode="aspectFill" /> <image :src="list.faceUrl" class="avatar wh80" mode="aspectFill" />
</view>
<view v-else>
<image :src="item.fromFaceUrl" class="avatar wh80" mode="aspectFill" />
</view> </view>
<view class="df fdc mlr20"> <view class="df fdc mlr20">
@ -475,7 +485,7 @@
</view> </view>
<view v-if="showGhost" :style="{ height: `${ghostBox.height}px`, transition: `${ghostBox.duration}s` }"> <view v-if="showGhost" :style="{ height: `${ghostBox.height}px`, transition: `${ghostBox.duration}s` }">
</view> </view>
<view class="ghost" :style="{height: toolHeight + 'px'}"></view> <view class="ghost" :style="{ height: toolHeight + 'px' }"></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@ -527,7 +537,7 @@
<view class="avatar"> <view class="avatar">
<image class="wh80 cir" :src="redPacket.fromUrl" mode="scaleToFill" /> <image class="wh80 cir" :src="redPacket.fromUrl" mode="scaleToFill" />
</view> </view>
<view class="ml15 f32">{{redPacket.fromName}}的红包</view> <view class="ml15 f32">{{ redPacket.fromName }}的红包</view>
</view> </view>
<view class="app_name mt15 mlr30 tac f40">{{ redPacket.blessing }}</view> <view class="app_name mt15 mlr30 tac f40">{{ redPacket.blessing }}</view>
<!-- --> <!-- -->
@ -537,7 +547,7 @@
<!-- redPacket.redStatus true可以领取 false不可领取 --> <!-- redPacket.redStatus true可以领取 false不可领取 -->
<view class="amount f32" v-if="!redPacket.redStatus"> <view class="amount f32" v-if="!redPacket.redStatus">
<text class="">已领取</text> <text class="">已领取</text>
<text class="value">{{redPacket.amount}}</text> <text class="value">{{ redPacket.amount }}</text>
<text class="unit" v-if="redPacket.payType == 1">余额</text> <text class="unit" v-if="redPacket.payType == 1">余额</text>
<text class="unit" v-else-if="redPacket.payType == 2">积分</text> <text class="unit" v-else-if="redPacket.payType == 2">积分</text>
</view> </view>
@ -557,17 +567,17 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import './index.scss'; @import './index.scss';
// //
#video { #video {
position: fixed; position: fixed;
top: 100%; top: 100%;
left: 0; left: 0;
} }
// //
.red-bag { .red-bag {
position: relative; position: relative;
width: 528rpx; width: 528rpx;
height: 60vh; height: 60vh;
@ -699,5 +709,5 @@
} }
} }
} }
} }
</style> </style>

View File

@ -1,75 +1,82 @@
<script setup> <script setup>
// + // +
// //
import TencentCloudChat from '@tencentcloud/chat'; import TencentCloudChat from '@tencentcloud/chat';
import { import {
ref, ref,
reactive, reactive,
nextTick, nextTick,
computed, computed,
} from 'vue' } from 'vue'
import { import {
screenHeight screenHeight
} from '@/components/public/Mixins' } from '@/components/public/Mixins'
import JyCommodityInformation from '@/components/public/jy-commodity-information' import JyCommodityInformation from '@/components/public/jy-commodity-information'
// //
import util from '@/common/js/util.js' import util from '@/common/js/util.js'
// import { inject } from 'vue'
const props = defineProps({
const { checkLink } = inject('util');
//
const props = defineProps({
msg: { msg: {
type: Object, type: Object,
}, },
}) })
// //
const emit = defineEmits(['plusClick', 'send']) const emit = defineEmits(['plusClick', 'send'])
// //
const plusList = computed(() => { const plusList = computed(() => {
let result = [ let result = [
// {
// type: 'order.png',
// label: '',
// value: 'chooseOrder'
// }, {
// type: 'shop.png',
// label: '',
// value: 'chooseShop'
// },
{ {
type: 'picture.png', type: 'picture.png',
label: '照片', label: '照片',
value: 'chooseImage' value: 'chooseImage',
}, { }, {
type: 'photograph.png', type: 'photograph.png',
label: '拍摄', label: '拍摄',
value: 'takePhoto' value: 'takePhoto',
}, { }, {
type: 'red-envelope.png', type: 'red-envelope.png',
label: '红包', label: '红包',
value: 'redEnvelope' value: 'redEnvelope',
} }
] ]
const isCustomer = props.msg.isCustomer;
// //
if (props.msg.type == 'C2C') result.push({ if (props.msg.type == 'C2C' && !isCustomer) result.push({
type: 'news-voice.png', type: 'news-voice.png',
label: '音视频', label: '音视频',
value: 'voice' value: 'voice'
}) })
//
if (isCustomer) result.unshift({
type: 'order.png',
label: '订单',
value: 'chooseOrder',
}, {
type: 'shop.png',
label: '商品',
value: 'chooseShop',
})
return result return result
}) })
const popupRef = ref(null) const popupRef = ref(null)
const popupRE = ref(null) const popupRE = ref(null)
const formData = reactive({ const formData = reactive({
name: '' name: ''
}) })
const popupData = reactive({ const popupData = reactive({
show: false, show: false,
title: '选择订单' title: '选择订单'
}) })
// //
const plusClickObj = { const plusClickObj = {
voice: () => { voice: () => {
// //
const menu = [{ const menu = [{
@ -109,7 +116,7 @@
// //
chooseShop: () => { chooseShop: () => {
// checkLink('pages/mine/browsed/index') checkLink('pages/news/goodsList/index')
}, },
// //
@ -122,7 +129,7 @@
sendType: { sendType: {
'C2C': 1, 'C2C': 1,
'GROUP': 2, 'GROUP': 2,
} [props.msg.type], }[props.msg.type],
num: props.msg.num, num: props.msg.num,
}) })
}) })
@ -144,10 +151,10 @@
sourceType: ['album'], sourceType: ['album'],
}) })
} }
} }
// //
function sendMsgImg(option) { function sendMsgImg(option) {
util.upload_image({ util.upload_image({
count: 1, count: 1,
type: 1, type: 1,
@ -175,23 +182,23 @@
payload: { payload: {
file: res file: res
}, },
onProgress: function(event) { onProgress: function (event) {
console.log('file uploading:', event) console.log('file uploading:', event)
} }
}) })
return return
} }
}); });
} }
// //
const consult = (content) => { const consult = (content) => {
let obj = { let obj = {
content, content,
type: 'order' type: 'order'
} }
popupRef.value.close() popupRef.value.close()
} }
</script> </script>
<template> <template>
@ -233,7 +240,7 @@
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
.NewsPlus { .NewsPlus {
// //
display: grid; display: grid;
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
@ -243,9 +250,9 @@
background-color: #fff; background-color: #fff;
border-radius: 20rpx; border-radius: 20rpx;
} }
} }
.jy-popup { .jy-popup {
width: 100%; width: 100%;
border-radius: 20px 20px 0px 0px; border-radius: 20px 20px 0px 0px;
@ -293,5 +300,5 @@
font-size: 22rpx; font-size: 22rpx;
color: #3D3D3D; color: #3D3D3D;
} }
} }
</style> </style>

View File

@ -0,0 +1,22 @@
<script setup>
/**
* 客服聊天界面商品列表
*/
//
import JyCommodityInformation from '@/components/public/jy-commodity-information'
</script>
<template>
<view class="appbw">
<scroll-view scroll-y scroll-with-animation>
<view v-for="(item, index) in 10">
<JyCommodityInformation :showType="5"></JyCommodityInformation>
</view>
</scroll-view>
</view>
</template>
<style lang="scss" scoped></style>

View File

@ -160,7 +160,6 @@
</view> </view>
<view class="listArea plr30 bfff"> <view class="listArea plr30 bfff">
<!-- -->
<view class="item ptb30 c333 f32" v-for="(item,index) in userList.data" :key="index" @click="handleUser(item)"> <view class="item ptb30 c333 f32" v-for="(item,index) in userList.data" :key="index" @click="handleUser(item)">
<view class="rows"> <view class="rows">
<view class="avatar fs0"> <view class="avatar fs0">

View File

@ -18,10 +18,10 @@ export default {
value: userinfo value: userinfo
}) })
// im // // im
util.getUserinfo().then(rs => { // util.getUserinfo().then(rs => {
util.loginTencent(userinfo) // util.loginTencent(userinfo)
}) // })
} else { } else {
// //
uni.redirectTo({ uni.redirectTo({

View File

@ -7,10 +7,11 @@ const mine = {
* 获取用户信息 * 获取用户信息
* @param {Object} param * @param {Object} param
*/ */
getUserinfo(param) { getUserinfo(query) {
return util.request({ return util.request({
url: `/user/getUserData`, url: `/user/MCustomerService/getInfo`,
method: 'GET', method: 'GET',
query: query,
}) })
}, },

View File

@ -207,6 +207,17 @@ export const news = {
method: 'POST' method: 'POST'
}) })
}, },
// 获取消息列表
getMessageList(param) {
return util.request({
url: `/user/chat/getMessageList`,
query: param.query,
data: param.data,
method: 'GET'
})
},
} }
export default news export default news

View File

@ -5,7 +5,8 @@ const config = {
host: 'http://localhost:5173', host: 'http://localhost:5173',
// #endif // #endif
// #ifndef H5 // #ifndef H5
host: 'https://1a4b9ed1.r24.cpolar.top/', // host: 'http://91f.xyz:8080',
host: 'https://b433d23.r24.cpolar.top/',
// #endif // #endif
// 支付方式配置 // 支付方式配置
payType: { payType: {

View File

@ -1411,28 +1411,23 @@ const util = {
*/ */
finalLogin(param, cb) { finalLogin(param, cb) {
// 登录令牌 // 登录令牌
const token = param.data const token = param.data.token
// 缓存token // 缓存token
uni.setStorageSync('token', token) uni.setStorageSync('token', token)
// 开启加载 // 缓存用户信息
uni.showLoading({ let userinfo = param.data.customerService;
mask: true
uni.setStorageSync('userinfo', JSON.stringify(userinfo))
store.commit('setState', {
key: 'userinfo',
value: userinfo
}) })
// 获取用户信息
util.getUserinfo((userinfo) => {
// 登录
uni.$emit('login')
setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: '/pages/index/index'
}) })
}, 500)
//
cb ? cb() : ''
})
}, },
// 登录腾讯聊天 // 登录腾讯聊天
@ -1466,34 +1461,34 @@ const util = {
}) })
}, },
/** // /**
* 获取用户信息 // * 获取用户信息
* @param {Function} cb 回调函数 // * @param {Function} cb 回调函数
*/ // */
getUserinfo(cb) { // getUserinfo(cb) {
return new Promise(reslove => { // return new Promise(reslove => {
// 请求接口 // // 请求接口
api.mine.getUserinfo().then(rs => { // api.mine.getUserinfo().then(rs => {
if (rs.code === 200) { // if (rs.code === 200) {
reslove(rs.data) // reslove(rs.data)
const userinfo = rs.data // const userinfo = rs.data
// 如果开启了青少年模式 // // 如果开启了青少年模式
if (userinfo.teenTime) util.getTeenMode(userinfo.teenTime) // if (userinfo.teenTime) util.getTeenMode(userinfo.teenTime)
// 提交 // // 提交
store.commit('setState', { // store.commit('setState', {
key: 'userinfo', // key: 'userinfo',
value: userinfo // value: userinfo
}) // })
// 用户信息 // // 用户信息
uni.setStorageSync('userinfo', userinfo) // uni.setStorageSync('userinfo', userinfo)
cb ? cb(userinfo) : '' // cb ? cb(userinfo) : ''
} // }
}).finally(() => { // }).finally(() => {
// 关闭加载 // // 关闭加载
uni.hideLoading() // uni.hideLoading()
}) // })
}) // })
}, // },
// 青少年模式 // 青少年模式
getTeenMode(teenTime) { getTeenMode(teenTime) {
@ -1562,6 +1557,14 @@ const util = {
}).catch(rs => { }).catch(rs => {
console.log('tim logout error:', rs); console.log('tim logout error:', rs);
}); });
api.login.userLoginOut().then(rs => {
setTimeout(() => {
uni.navigateTo({
url: '/pages/login/login',
})
}, 500)
})
} }
// 把vuex的值改成未登录的状态 // 把vuex的值改成未登录的状态

View File

@ -1,61 +1,125 @@
<script setup> <script setup>
// //
import { import api from '@/api/index.js'
onMounted, import {
onMounted, onUnmounted,
ref, ref,
reactive, reactive,
getCurrentInstance, getCurrentInstance,
} from 'vue'; } from 'vue';
import { import {
onLoad, onLoad,
onReady, onReady,
onHide, onHide,
onPullDownRefresh, onPullDownRefresh,
onReachBottom, onReachBottom,
} from '@dcloudio/uni-app' } from '@dcloudio/uni-app'
// //
import util from '@/common/js/util.js' import util from '@/common/js/util.js'
const chatList = reactive([{ const chatList = reactive([{
id: 1, id: 1,
avatar: 'https://p3-flow-imagex-sign.byteimg.com/user-avatar/9f4488a87a17f6f31b9716331e14fe26~tplv-a9rns2rl98-icon-tiny.jpeg?rk3s=98c978ad&x-expires=1740537084&x-signature=OrjX8tZaafN4XJE2o8QzZDs3Q20%3D', avatar: 'https://p3-flow-imagex-sign.byteimg.com/user-avatar/9f4488a87a17f6f31b9716331e14fe26~tplv-a9rns2rl98-icon-tiny.jpeg?rk3s=98c978ad&x-expires=1740537084&x-signature=OrjX8tZaafN4XJE2o8QzZDs3Q20%3D',
name: '客户 A', name: '客户 A',
lastMessage: '您好,商品什么时候发货?', lastMessage: '您好,商品什么时候发货?',
dot: 1, dot: 1,
}, },
{ {
id: 2, id: 2,
avatar: 'https://p3-flow-imagex-sign.byteimg.com/user-avatar/9f4488a87a17f6f31b9716331e14fe26~tplv-a9rns2rl98-icon-tiny.jpeg?rk3s=98c978ad&x-expires=1740537084&x-signature=OrjX8tZaafN4XJE2o8QzZDs3Q20%3D', avatar: 'https://p3-flow-imagex-sign.byteimg.com/user-avatar/9f4488a87a17f6f31b9716331e14fe26~tplv-a9rns2rl98-icon-tiny.jpeg?rk3s=98c978ad&x-expires=1740537084&x-signature=OrjX8tZaafN4XJE2o8QzZDs3Q20%3D',
name: '客户 B', name: '客户 B',
lastMessage: '这个商品有优惠吗?', lastMessage: '这个商品有优惠吗?',
dot: '', dot: '',
}
])
//
const userinfo = JSON.parse(uni.getStorageSync('userinfo'))
console.log(userinfo);
onMounted(() => {
getList()
addListener()
})
onUnmounted(() => {
removeListener()
})
//
function addListener() {
let onMessageReceived = function (event) {
getList()
} }
])
uni.$chat.on(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED, onMessageReceived);
}
//
function removeListener() {
uni.$chat.on(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED);
}
//
function getList() {
api.news.getMessageList({
query: {
userId: userinfo.serviceId,
}
}).then(rs => {
if (rs.code == 200) {
// list.data = handleList(rs.data);
return
}
util.alert({
content: rs.msg,
showCancel: false,
})
})
}
// //
// const userinfo = computed(() => {
// return store.state.userinfo
// })
/**
/**
* 去聊天 * 去聊天
* @param {Number} item 聊天对象 * @param {Number} item 聊天对象
*/ */
function handleChat(item) { function handleChat(item) {
// //
} }
/** /**
* 跳转 * 跳转
* @param {String} url 路由地址 * @param {String} url 路由地址
*/ */
function link(url) { function link(url) {
uni.navigateTo({ uni.navigateTo({
url, url,
}) })
} }
// 退
function handleLogout() {
util.alert({
content: '确认退出登录吗?',
}).then(rs => {
if (!rs.confirm) return
util.logout(() => {
// #ifdef APP
plus.runtime.restart()
// #endif
})
})
}
</script> </script>
<template> <template>
@ -69,14 +133,17 @@
</view> </view>
<view class="info f1 ml20"> <view class="info f1 ml20">
<view class="name c333 f34">客服小A</view> <view class="name c333 f34">{{ userinfo.serviceName }}</view>
<view class="mt10 c666 f28">店铺客服</view> <view class="mt10 c666 f28">店铺客服</view>
</view> </view>
</view> </view>
<view class="pr login-out">
<view class="out-btn" @click="handleLogout">退出登录</view>
</view>
</view> </view>
<!-- 商家订单 --> <!-- 商家订单 -->
<view class="rows ptb30 plr20"> <view class=" rows ptb30 plr20">
<view class="">商家订单管理</view> <view class="">商家订单管理</view>
<uni-icons type="right" /> <uni-icons type="right" />
</view> </view>
@ -97,7 +164,7 @@
<view class="rows"> <view class="rows">
<view class="content mt10 c666 f24">{{ item.lastMessage }}</view> <view class="content mt10 c666 f24">{{ item.lastMessage }}</view>
<view class="dot cfff f22"> <view class="dot cfff f22">
<view class="content" v-if="item.dot">{{item.dot}}</view> <view class="content" v-if="item.dot">{{ item.dot }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -107,16 +174,28 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
// //
.header { .header {
display: flex;
justify-content: space-between;
.background { .background {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
}
// .login-out {
.list { display: table;
.out-btn {
display: table-cell;
vertical-align: middle;
}
}
}
//
.list {
.item { .item {
border-top: 1rpx solid #eee; border-top: 1rpx solid #eee;
@ -135,5 +214,5 @@
} }
} }
} }
} }
</style> </style>

View File

@ -135,5 +135,4 @@ function handleLogin() {
height: 200rpx; height: 200rpx;
} }
} }
</style> </style>

View File

@ -2,9 +2,9 @@ import {
__commonJS __commonJS
} from "./chunk-TDUMLE5V.js"; } from "./chunk-TDUMLE5V.js";
// ../../../../document/九亿商城/jy/service/node_modules/@tencentcloud/chat/index.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/@tencentcloud/chat/index.js
var require_chat = __commonJS({ var require_chat = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/@tencentcloud/chat/index.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/@tencentcloud/chat/index.js"(exports, module) {
!function(e, t) { !function(e, t) {
"object" == typeof exports && "undefined" != typeof module ? module.exports = t() : "function" == typeof define && define.amd ? define(t) : (e = "undefined" != typeof globalThis ? globalThis : e || self).TencentCloudChat = t(); "object" == typeof exports && "undefined" != typeof module ? module.exports = t() : "function" == typeof define && define.amd ? define(t) : (e = "undefined" != typeof globalThis ? globalThis : e || self).TencentCloudChat = t();
}(exports, function() { }(exports, function() {

View File

@ -1,19 +1,19 @@
{ {
"hash": "a409d935", "hash": "983ba944",
"configHash": "da5c2bdf", "configHash": "74c0c30e",
"lockfileHash": "7b6ef450", "lockfileHash": "278dad13",
"browserHash": "8066c8cc", "browserHash": "7f88594e",
"optimized": { "optimized": {
"@tencentcloud/chat": { "@tencentcloud/chat": {
"src": "../../../../../node_modules/@tencentcloud/chat/index.js", "src": "../../../../../node_modules/@tencentcloud/chat/index.js",
"file": "@tencentcloud_chat.js", "file": "@tencentcloud_chat.js",
"fileHash": "0e28df2d", "fileHash": "68cefafa",
"needsInterop": true "needsInterop": true
}, },
"crypto-js": { "crypto-js": {
"src": "../../../../../node_modules/crypto-js/index.js", "src": "../../../../../node_modules/crypto-js/index.js",
"file": "crypto-js.js", "file": "crypto-js.js",
"fileHash": "d3e1eda0", "fileHash": "d5371c8c",
"needsInterop": true "needsInterop": true
} }
}, },

View File

@ -16,9 +16,9 @@ var require_crypto = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/core.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/core.js
var require_core = __commonJS({ var require_core = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/core.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/core.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(); module.exports = exports = factory();
@ -624,9 +624,9 @@ var require_core = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/x64-core.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/x64-core.js
var require_x64_core = __commonJS({ var require_x64_core = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/x64-core.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/x64-core.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -881,9 +881,9 @@ var require_x64_core = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/lib-typedarrays.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/lib-typedarrays.js
var require_lib_typedarrays = __commonJS({ var require_lib_typedarrays = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/lib-typedarrays.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/lib-typedarrays.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -926,9 +926,9 @@ var require_lib_typedarrays = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-utf16.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/enc-utf16.js
var require_enc_utf16 = __commonJS({ var require_enc_utf16 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-utf16.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/enc-utf16.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -1044,9 +1044,9 @@ var require_enc_utf16 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-base64.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/enc-base64.js
var require_enc_base64 = __commonJS({ var require_enc_base64 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-base64.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/enc-base64.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -1152,9 +1152,9 @@ var require_enc_base64 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-base64url.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/enc-base64url.js
var require_enc_base64url = __commonJS({ var require_enc_base64url = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-base64url.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/enc-base64url.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -1271,9 +1271,9 @@ var require_enc_base64url = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/md5.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/md5.js
var require_md5 = __commonJS({ var require_md5 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/md5.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/md5.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -1450,9 +1450,9 @@ var require_md5 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha1.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha1.js
var require_sha1 = __commonJS({ var require_sha1 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha1.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha1.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -1541,9 +1541,9 @@ var require_sha1 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha256.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha256.js
var require_sha256 = __commonJS({ var require_sha256 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha256.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha256.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -1662,9 +1662,9 @@ var require_sha256 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha224.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha224.js
var require_sha224 = __commonJS({ var require_sha224 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha224.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha224.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_sha256()); module.exports = exports = factory(require_core(), require_sha256());
@ -1707,9 +1707,9 @@ var require_sha224 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha512.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha512.js
var require_sha512 = __commonJS({ var require_sha512 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha512.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha512.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_x64_core()); module.exports = exports = factory(require_core(), require_x64_core());
@ -1989,9 +1989,9 @@ var require_sha512 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha384.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha384.js
var require_sha384 = __commonJS({ var require_sha384 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha384.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha384.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_x64_core(), require_sha512()); module.exports = exports = factory(require_core(), require_x64_core(), require_sha512());
@ -2035,9 +2035,9 @@ var require_sha384 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha3.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha3.js
var require_sha3 = __commonJS({ var require_sha3 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha3.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/sha3.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_x64_core()); module.exports = exports = factory(require_core(), require_x64_core());
@ -2237,9 +2237,9 @@ var require_sha3 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/ripemd160.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/ripemd160.js
var require_ripemd160 = __commonJS({ var require_ripemd160 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/ripemd160.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/ripemd160.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -2708,9 +2708,9 @@ var require_ripemd160 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/hmac.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/hmac.js
var require_hmac = __commonJS({ var require_hmac = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/hmac.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/hmac.js"(exports, module) {
(function(root, factory) { (function(root, factory) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core()); module.exports = exports = factory(require_core());
@ -2815,9 +2815,9 @@ var require_hmac = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pbkdf2.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pbkdf2.js
var require_pbkdf2 = __commonJS({ var require_pbkdf2 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/pbkdf2.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pbkdf2.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_sha256(), require_hmac()); module.exports = exports = factory(require_core(), require_sha256(), require_hmac());
@ -2913,9 +2913,9 @@ var require_pbkdf2 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/evpkdf.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/evpkdf.js
var require_evpkdf = __commonJS({ var require_evpkdf = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/evpkdf.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/evpkdf.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_sha1(), require_hmac()); module.exports = exports = factory(require_core(), require_sha1(), require_hmac());
@ -3004,9 +3004,9 @@ var require_evpkdf = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/cipher-core.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/cipher-core.js
var require_cipher_core = __commonJS({ var require_cipher_core = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/cipher-core.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/cipher-core.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_evpkdf()); module.exports = exports = factory(require_core(), require_evpkdf());
@ -3648,9 +3648,9 @@ var require_cipher_core = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-cfb.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-cfb.js
var require_mode_cfb = __commonJS({ var require_mode_cfb = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-cfb.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-cfb.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -3700,9 +3700,9 @@ var require_mode_cfb = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ctr.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-ctr.js
var require_mode_ctr = __commonJS({ var require_mode_ctr = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ctr.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-ctr.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -3740,9 +3740,9 @@ var require_mode_ctr = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ctr-gladman.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-ctr-gladman.js
var require_mode_ctr_gladman = __commonJS({ var require_mode_ctr_gladman = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ctr-gladman.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-ctr-gladman.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -3815,9 +3815,9 @@ var require_mode_ctr_gladman = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ofb.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-ofb.js
var require_mode_ofb = __commonJS({ var require_mode_ofb = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ofb.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-ofb.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -3853,9 +3853,9 @@ var require_mode_ofb = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ecb.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-ecb.js
var require_mode_ecb = __commonJS({ var require_mode_ecb = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ecb.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/mode-ecb.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -3884,9 +3884,9 @@ var require_mode_ecb = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-ansix923.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-ansix923.js
var require_pad_ansix923 = __commonJS({ var require_pad_ansix923 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-ansix923.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-ansix923.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -3916,9 +3916,9 @@ var require_pad_ansix923 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-iso10126.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-iso10126.js
var require_pad_iso10126 = __commonJS({ var require_pad_iso10126 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-iso10126.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-iso10126.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -3944,9 +3944,9 @@ var require_pad_iso10126 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-iso97971.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-iso97971.js
var require_pad_iso97971 = __commonJS({ var require_pad_iso97971 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-iso97971.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-iso97971.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -3971,9 +3971,9 @@ var require_pad_iso97971 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-zeropadding.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-zeropadding.js
var require_pad_zeropadding = __commonJS({ var require_pad_zeropadding = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-zeropadding.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-zeropadding.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -4005,9 +4005,9 @@ var require_pad_zeropadding = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-nopadding.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-nopadding.js
var require_pad_nopadding = __commonJS({ var require_pad_nopadding = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-nopadding.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/pad-nopadding.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -4028,9 +4028,9 @@ var require_pad_nopadding = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/format-hex.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/format-hex.js
var require_format_hex = __commonJS({ var require_format_hex = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/format-hex.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/format-hex.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_cipher_core()); module.exports = exports = factory(require_core(), require_cipher_core());
@ -4088,9 +4088,9 @@ var require_format_hex = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/aes.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/aes.js
var require_aes = __commonJS({ var require_aes = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/aes.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/aes.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core()); module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -4242,9 +4242,9 @@ var require_aes = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/tripledes.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/tripledes.js
var require_tripledes = __commonJS({ var require_tripledes = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/tripledes.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/tripledes.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core()); module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -5023,9 +5023,9 @@ var require_tripledes = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/rc4.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/rc4.js
var require_rc4 = __commonJS({ var require_rc4 = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/rc4.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/rc4.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core()); module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -5106,9 +5106,9 @@ var require_rc4 = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/rabbit.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/rabbit.js
var require_rabbit = __commonJS({ var require_rabbit = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/rabbit.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/rabbit.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core()); module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -5235,9 +5235,9 @@ var require_rabbit = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/rabbit-legacy.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/rabbit-legacy.js
var require_rabbit_legacy = __commonJS({ var require_rabbit_legacy = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/rabbit-legacy.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/rabbit-legacy.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core()); module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -5361,9 +5361,9 @@ var require_rabbit_legacy = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/blowfish.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/blowfish.js
var require_blowfish = __commonJS({ var require_blowfish = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/blowfish.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/blowfish.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core()); module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -6550,9 +6550,9 @@ var require_blowfish = __commonJS({
} }
}); });
// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/index.js // ../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/index.js
var require_crypto_js = __commonJS({ var require_crypto_js = __commonJS({
"../../../../document/九亿商城/jy/service/node_modules/crypto-js/index.js"(exports, module) { "../../../../../桌面/jiuyiUniapp/service/node_modules/crypto-js/index.js"(exports, module) {
(function(root, factory, undef) { (function(root, factory, undef) {
if (typeof exports === "object") { if (typeof exports === "object") {
module.exports = exports = factory(require_core(), require_x64_core(), require_lib_typedarrays(), require_enc_utf16(), require_enc_base64(), require_enc_base64url(), require_md5(), require_sha1(), require_sha256(), require_sha224(), require_sha512(), require_sha384(), require_sha3(), require_ripemd160(), require_hmac(), require_pbkdf2(), require_evpkdf(), require_cipher_core(), require_mode_cfb(), require_mode_ctr(), require_mode_ctr_gladman(), require_mode_ofb(), require_mode_ecb(), require_pad_ansix923(), require_pad_iso10126(), require_pad_iso97971(), require_pad_zeropadding(), require_pad_nopadding(), require_format_hex(), require_aes(), require_tripledes(), require_rc4(), require_rabbit(), require_rabbit_legacy(), require_blowfish()); module.exports = exports = factory(require_core(), require_x64_core(), require_lib_typedarrays(), require_enc_utf16(), require_enc_base64(), require_enc_base64url(), require_md5(), require_sha1(), require_sha256(), require_sha224(), require_sha512(), require_sha384(), require_sha3(), require_ripemd160(), require_hmac(), require_pbkdf2(), require_evpkdf(), require_cipher_core(), require_mode_cfb(), require_mode_ctr(), require_mode_ctr_gladman(), require_mode_ofb(), require_mode_ecb(), require_pad_ansix923(), require_pad_iso10126(), require_pad_iso97971(), require_pad_zeropadding(), require_pad_nopadding(), require_format_hex(), require_aes(), require_tripledes(), require_rc4(), require_rabbit(), require_rabbit_legacy(), require_blowfish());

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,7 @@ import {
import uni from '@dcloudio/vite-plugin-uni'; import uni from '@dcloudio/vite-plugin-uni';
// let target = 'http://91f.xyz:8080' // let target = 'http://91f.xyz:8080'
let target = 'http://1a4b9ed1.r24.cpolar.top' let target = 'https://b433d23.r24.cpolar.top/'
export default defineConfig({ export default defineConfig({
plugins: [uni()], plugins: [uni()],