mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

Browse Source
This commit is contained in:
weipengfei 2023-10-31 16:08:20 +08:00
commit 4a1e214501
4 changed files with 422 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/sd-live-page/histroy.nvue
View File

@ -267,7 +267,7 @@
getAjuser
} from '@/api/live.js'
import {
HTTP_REQUEST_URL_FIVE
VUE_APP_WS_URL
} from '@/config/app.js';
import uniPopup from '@/components/unipopup/live-uni-popup.vue';
@ -340,8 +340,7 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
userinfo: null,
hoveredIndex: -1,
regIndex: -1,
gifts: [
],
gifts: [],
gifsobj: {},
gift_num: '',
isShow1: false,
@ -1621,7 +1620,8 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
.txtba-b {
font-size: 33rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;color: #F84221;
font-weight: 500;
color: #F84221;
line-height: 60rpx;
}

39
components/sd-live-page/livepage.nvue
View File

@ -1,5 +1,6 @@
<template>
<view class="container">
<view class="" :style="{'height':heightG+'px'}" @click="quanju">
<view class="top-do-box">
<view class="room-info">
<view class="room-logo-box">
@ -50,7 +51,7 @@
<mh-msgList ref="msgList" :msgList="msgList"></mh-msgList>
</view>
<!-- 底部操作 -->
</view>
<view class="inpit-box-bg" v-if="focus">
<view class="inpit-box-body">
@ -286,7 +287,11 @@
},
room: {
type: Object,
}
},
heightG :{
type: String,
default: '760'
},
},
components: {
uniPopup,
@ -467,6 +472,7 @@
if (res.code == 1) {
this.$refs.share.close()
uni.hideModal()
this.getuser()
} else {
uni.showModal({
title: '提示',
@ -570,7 +576,7 @@
//购买商品
shopp(item) {
console.log(item)
// console.log(item)
uni.navigateTo({
url:'/pages/goods_details/index?id='+item.app_goods_id
})
@ -898,9 +904,25 @@
},
//关闭直播间
outroom: function() {
uni.showModal({
title: '提示', // 对话框标题
content: '是否确定退出直播间', // 对话框内容
showCancel: true, // 是否显示取消按钮，默认为 true
cancelText: '取消', // 取消按钮的文字，默认为 "取消"
cancelColor: '#000000', // 取消按钮的文本颜色，默认为 "#000000"
confirmText: '确定', // 确定按钮的文字，默认为 "确定"
confirmColor: '#3CC51F', // 确定按钮的文本颜色，默认为 "#3CC51F"
success(res) {
if (res.confirm) {
uni.redirectTo({
url: '/pages/room/index'
})
} else if (res.cancel) {
console.log('用户点击了取消按钮')
}
}
})
},
get_live_room() {
@ -2050,9 +2072,10 @@
.room-users-box {
width: 200rpx;
height: 65upx;
height: 70upx;
display: flex;
margin-top: 10rpx;
}
@ -2061,21 +2084,19 @@
flex-direction: row;
flex-wrap: nowrap;
width: 200rpx;
height: 80upx;
margin-top: 10rpx;
height: 75upx;
}
.top-scroll-users-header {
width: 60upx;
height: 60upx;
width: 63upx;
height: 63upx;
border-radius: 50%;
margin-right: 10upx;
overflow: hidden;
}
// .top-scroll-users-header image {

13
manifest.json
View File

@ -32,7 +32,9 @@
"description" : "uni小程序"
},
"Maps" : {},
"Push": {}
"Push" : {},
"Record" : {},
"LivePusher" : {}
},
"safearea" : {
"bottom" : {
@ -45,6 +47,8 @@
"android" : {
"resizeableActivity" : true,
"permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
@ -58,17 +62,17 @@
"<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
"permissionExternalStorage" : {
@ -339,3 +343,4 @@
}
//拨打电话权限关闭
/* ios打包配置 */

15
utils/uniMPevent.js
View File

@ -55,5 +55,20 @@ export const initEvent = () => {
console.log('收到小程序事件: ' + JSON.stringify(ret));
}
//直播小程序跳转商城购买商品
if (ret.event == 'live_shop') {
console.log(JSON.stringify(ret))
let arr1=ret.data
mp.closeUniMP(ret.fromAppid, (ret) => {
// console.log('closeUniMP: ' + JSON.stringify(ret));
setTimeout(()=>{
uni.navigateTo({
url:'/pages/goods_details/index?id='+arr1.app_goods_id
},1000)
})
});
// console.log('收到小程序事件: ' + JSON.stringify(ret));
}
});
}