Skip to content

L
lumastoreapp
Commit 98ead2f0 authored by xieyishang's avatar xieyishang
Browse files
Options

addxx

parent f2104302
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4177 additions and 10 deletions
manifest.json
View file @ 98ead2f0
......@@ -185,6 +185,20 @@
"pid" : "2930",
"parameters" : {}
}
},
"TX-TencentIM" : {
"__plugin_info__" : {
"name" : "腾讯即时通信IM(完整版) qq群933785472 - [试用版，仅用于自定义调试基座]",
"description" : "腾讯im插件致力于让用户轻松接入im功能",
"platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=2615",
"android_package_name" : "",
"ios_bundle_id" : "",
"isCloud" : true,
"bought" : 0,
"pid" : "2615",
"parameters" : {}
}
}
}
},
......
pages.json
View file @ 98ead2f0
......@@ -419,6 +419,28 @@
"scrollIndicator": "none"
}
}
},
{
"path": "pages/chat/chat/chat",
"style": {
"navigationBarTitleText": "会话",
"app-plus": {
"scrollIndicator": "none",
"titleNView": false,
"softinputNavBar": "none",
"softinputMode": "adjustResize"
}
}
},
{
"path": "pages/chat/message/message",
"style": {
"navigationBarTitleText": "消息",
"app-plus": {
"scrollIndicator": "none"
}
}
}
],
"globalStyle": {
......@@ -432,12 +454,19 @@
"selectedColor": "#FF6900",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"list": [{
"list": [
{
"pagePath": "pages/index/index",
"iconPath": "static/tabbar/home_onac.png",
"selectedIconPath": "static/tabbar/home_isac.png",
"text": "后台"
},
{
"pagePath": "pages/chat/message/message",
"iconPath": "static/tabbar/xiaoxi_0.png",
"selectedIconPath": "static/tabbar/xiaoxi_1.png",
"text": "客户消息"
},
{
"pagePath": "pages/user/reseller/reseller",
"iconPath": "static/tabbar/ziji_onac1.png",
......
pages/chat/chat/chat.vue 0 → 100644
View file @ 98ead2f0
This diff is collapsed.
pages/chat/chat/global.scss 0 → 100644
View file @ 98ead2f0
This diff is collapsed.
pages/chat/message/message.scss 0 → 100644
View file @ 98ead2f0
page{
background-color: #FAFAFA;
padding-bottom: 100upx;
}
.liaotiancards{
}
.chatlist{
background-color: #fff;
}
.chatitem{
padding: 28upx 32upx;
border-bottom: 1px solid #f3f3f3;
.usertxbox{
position: relative;
}
.tagmsgs{
position: absolute;
z-index: 9;
top: -5upx;
right: 0;
width: 40upx;
height: 40upx;
line-height: 40upx;
background-color: #ff0000;
color: #FFFFFF;
border-radius: 50%;
text-align: center;
font-size: 24upx;
}
.usertx{
border: 1px solid #f1f1f1;
width: 106upx;
height: 106upx;
border-radius: 50%;
}
.chatitem_r{
margin-left: 32upx;
.linenamebox{
.nikenames{
color: #333333;
font-size: 32upx;
}
.qiyenames{
color: #999999;
font-size: 24upx;
margin-left: 24upx;
}
.istimes{
color: #999999;
font-size: 26upx;
}
}
.isliaotcon{
margin-top: 33upx;
color: #666666;
font-size: 28upx;
}
}
}
.chatlist .chatitem:last-child {
border: 0;
}
// 消息end
.tuijiancards{
padding: 42upx 32upx;
background: #fff;
.titheadbox{
.tititis{
color: #333333;
font-weight: bold;
font-size: 32upx;
}
.clearionc{
width: 28upx;
height: 28upx;
}
}
.usertxss{
margin-top: 26upx;
.touxiongbox{
.pbtouxiongs{
position: relative;
width: 60upx;
height: 60upx;
border-radius: 50%;
}
.pbtouxiongs:nth-child(2){
left: -10upx;
}
.pbtouxiongs:nth-child(3){
left: -20upx;
}
.pbtouxiongs:nth-child(4){
left: -30upx;
}
.pbtouxiongs:nth-child(5){
left: -40upx;
}
.pbtouxiongs:nth-child(6){
left: -50upx;
}
.pbtouxiongs:nth-child(7){
left: -60upx;
}
.pbtouxiongs:nth-child(8){
left: -70upx;
}
.pbtouxiongs:nth-child(9){
left: -80upx;
}
.pbtouxiongs:nth-child(10){
left: -90upx;
}
}
.tagboxs{
width: 128upx;
height: 52upx;
line-height: 52upx;
text-align: center;
color: #FDB933;
font-size: 28upx;
border: 1px solid #FDB933;
border-radius: 10upx;
}
}
}
.renlistsbox{
}
\ No newline at end of file
pages/chat/message/message.vue 0 → 100644
View file @ 98ead2f0
<template>
<!-- 消息页面 -->
<view class="message">
<!-- 聊天 -->
<view class="liaotiancards">
<view class="chatlist">
<view @tap="tochats(item)" class="chatitem flex" v-for="(item,index) in conversationList" :key="index">
<view class="usertxbox">
<view class="tagmsgs" v-if="item.unreadCount!=0 && item.unreadCount<99">{{item.unreadCount}}</view>
<view class="tagmsgs" v-else-if="item.unreadCount!=0 && item.unreadCount>=99">99</view>
<image class="usertx" :src="item.avatar|parseurl" mode=""></image>
</view>
<view class="chatitem_r flex1">
<view class="linenamebox flex ali-c jus-b">
<view class="flex ali-c">
<view class="nikenames">{{item.showName}}</view>
<view v-if="item.type==1" class="qiyenames">用户</view>
<view v-if="item.type==2" class="qiyenames">群组</view>
</view>
<view v-if="item.lastMessage" class="istimes">{{item.lastMessage.time|dateFormat}}</view>
</view>
<view v-if="item.lastMessage" class="isliaotcon oneline">
<text v-show="item.unreadCount==0">[已读]</text>
<text v-show="item.unreadCount!=0">[未读]</text>
<text v-if="item.lastMessage.textElem && item.type==1">{{item.lastMessage.textElem.msg}}</text>
<text v-if="item.lastMessage.elemType==2">[自定义消息]</text>
<text v-if="item.lastMessage.elemType==3">[图片消息]</text>
<text v-if="item.lastMessage.elemType==4">[语音消息]</text>
<text v-if="item.lastMessage.elemType==5">[视频消息]</text>
<text v-if="item.lastMessage.elemType==6">[文件消息]</text>
<text v-if="item.lastMessage.elemType==7">[地址位置消息]</text>
<text v-if="item.lastMessage.elemType==8">[表情消息]</text>
<text v-if="item.lastMessage.elemType==9">[群提示消息]</text>
</view>
</view>
</view>
<view class="chatitem flex" @tap="loginfun">
<image class="usertx" src="/static/store/yueicon.png" mode=""></image>
<view class="chatitem_r flex1">
<view class="linenamebox flex ali-c jus-b">
<view class="flex ali-c">
<view class="nikenames">通知</view>
<view class="qiyenames">系统通知</view>
</view>
<view class="istimes">11月2日</view>
</view>
<view class="isliaotcon oneline">恭喜您获得点餐优惠券</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {formatMsgTime} from "@/utils/yicode.js";
export default {
components: {},
//过滤器
filters: {
dateFormat(value) {
console.info("value", value);
return formatMsgTime(value);
}
},
data() {
return {
};
},
onLoad() {
// #ifdef APP-PLUS
this.loginfun();
// #endif
},
onShow() {
// #ifdef APP-PLUS
this.getConversationList();
// #endif
},
computed: {
conversationList() { //消息会话列表
return this.$store.state.myconversationList;
},
},
methods: {
loginfun() {
let userInfo = uni.getStorageSync("userInfo");
console.info("userInfo",userInfo);
// || userInfo.user_id=="817163" 9715
if(userInfo.user_id ){
let userids = 'u_'+String(userInfo.user_id)
// this.$store.dispatch("baselogin", "user1"); //登录
this.$store.dispatch("baselogin", userids); //登录
}
},
//获取会话列表 APP
getConversationList() {
this.$store.dispatch("getConversationList", {}); //获取会话列表
},
tochats(item) {
let type = item.type;//1单聊 2群聊
let userId = item.userId?item.userId:'';//对方的用户id
let groupId = item.groupId?item.groupId:'';//群聊id
uni.navigateTo({
url: `/pages/chat/chat/chat?type=${type}&userId=${userId}&groupId=${groupId}`
})
}
}
}
</script>
<style lang="scss">
@import "./message.scss";
</style>
pages/deliveryCost/deliveryCost.vue
View file @ 98ead2f0
......@@ -227,7 +227,7 @@
}
.inputboxs .input {
padding: 20upx;
padding: 0 20upx;
height: 80upx;
line-height: 80upx;
}
......
pages/order/order.vue
View file @ 98ead2f0
<template>
<!-- 订单列表页面 -->
<view class="content">
<view class="content" style="overflow: hidden;">
<view class="navbar">
<scroll-view :scroll-x="true" style="width: 100vw;" :scroll-left="scrleft" :scroll-with-animation="true" >
<view class="ali-c">
......
pages/user/fenxiao/addcard/addcard.vue
View file @ 98ead2f0
......@@ -4,26 +4,26 @@
<view class="shop_tit" >添加银行卡</view>
<view class="s_login">
<picker @change="bindPickerChange" :value="index" :range="isselectcard" range-key="bank_name" >
<view class="biao_01">
<view class="biao_01 ali-c">
<view class="biao_01_l">开户行：</view>
<view class="biao_01_r">
<input class="uni-input" disabled="disabled" v-model="isselectcard[index].bank_name" placeholder="请输入" />
</view>
</view>
</picker>
<view class="biao_01">
<view class="biao_01 ali-c">
<view class="biao_01_l">姓名：</view>
<view class="biao_01_r">
<input class="uni-input" v-model="realname" placeholder="请输入" />
</view>
</view>
<view class="biao_01">
<view class="biao_01 ali-c">
<view class="biao_01_l" style="white-space:nowrap;">银行卡号：</view>
<view class="biao_01_r">
<input class="uni-input" v-model="cardno" placeholder="请输入" />
</view>
</view>
<view class="biao_01">
<view class="biao_01 ali-c">
<view class="biao_01_l">开户支行：</view>
<view class="biao_01_r">
<input class="uni-input" v-model="branch" placeholder="请输入" />
......@@ -116,7 +116,10 @@
color: #fff;
padding: 20px 20px;
}
.uni-input{background-color: #fff;padding-top: 5px;}
.uni-input{background-color: #fff;padding-top: 5px;
height: 88upx;
line-height: 88upx;
}
.s_login {
margin: 0 10px;
border-radius: 5px;
......
store/Im_store.js 0 → 100644
View file @ 98ead2f0
This diff is collapsed.
store/index.js
View file @ 98ead2f0
......@@ -19,6 +19,18 @@ import Voice from '@/utils/QS-baiduyy/QS-baiduyy.js';//接入百度语音播报a
// };
//IMadd
import {sdkAppID,sdkAppKey} from "@/utils/config.js";
let txIm = {};
// #ifdef APP-PLUS
txIm = uni.requireNativePlugin('TX-TencentIM');
// #endif
import Im_store from "./Im_store.js";//IM封装模块
//IMadd
let obj = {};
if(debug.isdebug==true){
//测试环境
......@@ -80,6 +92,7 @@ const store = new Vuex.Store({
horse_lng:0,
horse_lat:0,
is_closed:1, //0开启订单列表里的导航按钮 1关闭
...Im_store.state,//IMadd
},
mutations: {
is_closed(state,data){
......@@ -138,7 +151,8 @@ const store = new Vuex.Store({
//修改状态
changeisvoice(state,data){
state.isvoice = data;
}
},
...Im_store.mutations,//IMadd
},
//方法
actions: {
......@@ -200,7 +214,8 @@ const store = new Vuex.Store({
resolve();//结束
})
})
}
},
...Im_store.actions,//IMadd
}
})
......
utils/commen.js 0 → 100644
View file @ 98ead2f0
This diff is collapsed.
utils/config.js
View file @ 98ead2f0
......@@ -20,6 +20,15 @@ module.exports = {
Private_key: 'QAZWSXEDC123RFVA', //私钥 与后台基础设置中API安全秘钥相同，谨慎修改
// //测试 IM
// sdkAppID:1400494134,
// sdkAppKey:"8abfcf51fcf43b18f8ec01b6e924f058109502da7905ef4fb043ea90b0fb64ea",
//正式 IM
sdkAppID:1400583520 ,
sdkAppKey:"2a901ba4178ea5d194aa6bfd3c6a7d2da8dccd7ccc85155d618d8921d8bddbda",
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment