chore(brand): 统一将品牌名从雄戈小酒更改为橙虎小酒

- 更新alisms插件配置中的签名值
- 修改shopro插件中所有SQL脚本的品牌名称引用
- 更新商城配置、商品分类、演示数据中的品牌名称
- 替换后台登录页面的品牌标识
- 更新汇付分账配置中的媒介名称
- 修改登录预览生成脚本中的品牌显示
```
这个提交包含在:
可乐加冰
2026-10-28 14:55:54 +08:00
父节点 8f7fae009e
当前提交 a8cdc763cb
共有 57 个文件被更改,包括 1265 次插入 和 2287 次删除

查看文件

@@ -0,0 +1,164 @@
<!-- 微信小程序隐私授权弹窗(须放在页面级使用) -->
<template>
<!-- #ifdef MP-WEIXIN -->
<view v-if="visible" class="privacy-mask" @touchmove.stop.prevent>
<view class="privacy-panel" @tap.stop>
<view class="privacy-title">用户隐私保护提示</view>
<view class="privacy-content">
为上传身份证、银行卡等资料,需您同意
<text class="privacy-link" @tap.stop="openPrivacyContractPage">{{ privacyContractName || '《隐私政策》' }}</text>
后使用相册/相机选图功能。
</view>
<view class="privacy-tip" v-if="privacyUnderReview">您的隐私保护指引正在微信审核中,审核通过前可能无法选图。</view>
<view class="privacy-actions">
<button class="privacy-btn privacy-btn--ghost" hover-class="none" @tap.stop="onDisagree">拒绝</button>
<button
id="agree-privacy-btn"
class="privacy-btn privacy-btn--primary"
hover-class="none"
open-type="agreePrivacyAuthorization"
@agreeprivacyauthorization="onAgree"
>同意</button>
</view>
</view>
</view>
<!-- #endif -->
</template>
<script>
import { setPrivacyModalHandler, getPrivacySettingInfo, openPrivacyContract } from '@/shopro/wechat/privacy';
export default {
name: 'PrivacyAuthModal',
data() {
return {
visible: false,
privacyResolve: null,
privacyContractName: '',
privacyUnderReview: false
};
},
mounted() {
this.loadPrivacyInfo();
setPrivacyModalHandler((resolve) => {
if (this.visible) return;
this.privacyResolve = resolve;
this.visible = true;
});
},
beforeDestroy() {
setPrivacyModalHandler(null);
},
methods: {
async loadPrivacyInfo() {
const info = await getPrivacySettingInfo();
this.privacyContractName = info.privacyContractName || '';
this.privacyUnderReview = !!info.needAuthorization;
},
openPrivacyContractPage() {
openPrivacyContract();
},
onAgree() {
this.visible = false;
if (!this.privacyResolve) return;
const resolve = this.privacyResolve;
this.privacyResolve = null;
resolve({
event: 'agree',
buttonId: 'agree-privacy-btn'
});
},
onDisagree() {
if (this.privacyResolve) {
const resolve = this.privacyResolve;
this.privacyResolve = null;
resolve({ event: 'disagree' });
}
this.visible = false;
}
}
};
</script>
<style lang="scss" scoped>
.privacy-mask {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 10090;
background: rgba(0, 0, 0, 0.55);
display: flex;
align-items: center;
justify-content: center;
padding: 40rpx;
box-sizing: border-box;
}
.privacy-panel {
width: 100%;
max-width: 610rpx;
background: #fff;
border-radius: 24rpx;
padding: 40rpx 36rpx 32rpx;
box-sizing: border-box;
}
.privacy-title {
font-size: 32rpx;
font-weight: 600;
color: #222;
text-align: center;
}
.privacy-content {
margin-top: 24rpx;
font-size: 26rpx;
line-height: 1.7;
color: #666;
}
.privacy-link {
color: #1677ff;
}
.privacy-tip {
margin-top: 16rpx;
font-size: 24rpx;
line-height: 1.6;
color: #e6a23c;
}
.privacy-actions {
display: flex;
gap: 20rpx;
margin-top: 36rpx;
}
.privacy-btn {
flex: 1;
height: 80rpx;
line-height: 80rpx;
border-radius: 40rpx;
font-size: 28rpx;
font-weight: 500;
margin: 0;
padding: 0;
border: none;
}
.privacy-btn::after {
border: none;
}
.privacy-btn--ghost {
background: #f5f5f5;
color: #666;
}
.privacy-btn--primary {
background: linear-gradient(90deg, #1677ff, #4096ff);
color: #fff;
}
</style>

查看文件

@@ -1,361 +0,0 @@
<template>
<view class="live-card-wrap">
<!-- 小卡片 -->
<view class="sp-live-card" v-if="liveType == 2" :style="{ width: wh + 'rpx' }">
<view class="live-content" @tap="goRoom" :style="{ width: wh + 'rpx' }">
<image class="item-cover" :src="detail.share_img" mode="aspectFill"></image>
<view class="item-status">
<image class="status-img" :src="liveStatus[liveState].img" mode=""></image>
<text class="status-text">{{ liveStatus[liveState].title }}</text>
</view>
<view class="item-title u-ellipsis-1" :style="{ width: wh + 'rpx' }">{{ detail.name }}</view>
</view>
<view class="live-bottom" :style="{ width: wh + 'rpx' }">
<view class="live-info">
<view class="info-box">
<view class="info-name u-ellipsis-1" :style="{ width: wh + 'rpx' }">{{ detail.anchor_name }}</view>
</view>
</view>
<slot name="liveGoods">
<view class="live-goods" v-if="liveGoodsList.length">
<view class="live-goods__item" v-for="(goods, index) in liveGoodsList" :key="goods.id" v-if="index < 3">
<image class="live-goods__img" :src="goods.cover_img" mode=""></image>
<view class="live-goods__price" v-if="index < 2">¥{{ goods.price }}</view>
<view class="live-goods__mark" v-else>
<text>{{ liveGoodsList.length }}+</text>
</view>
</view>
</view>
</slot>
</view>
</view>
<!-- 大卡片 -->
<view class="big-card-wrap" v-if="liveType == 1">
<view class="content-one__item" @tap="goRoom">
<image class="item-cover" :src="detail.share_img" mode="widthFix"></image>
<view class="item-status">
<image class="status-img" :src="liveStatus[liveState].img" mode=""></image>
<text class="status-text">{{ liveStatus[liveState].title }}</text>
</view>
<view class="item-title u-ellipsis-1">{{ detail.name }}</view>
</view>
</view>
</view>
</template>
<script>
/**
* 小程序直播显示卡片
* @property {Object} detail - 直播卡片显示数据
* @property {Number} wh = [345] - 直播卡片宽度
* @property {Number|String} style = 2 - 1:大卡片;2::小卡片
*/
// #ifdef MP-WEIXIN
import { HAS_LIVE } from '@/env';
let livePlayer = null;
// 全局配置文件控制是否开启直播组件,没有此项功能的小程序,运行会报错。
if (HAS_LIVE) {
livePlayer = requirePlugin('live-player-plugin');
}
// #endif
let timer = null;
export default {
name: 'shoproLiveCard',
components: {},
data() {
return {
liveType: this.type,
liveState: this.detail.live_status,
liveGoodsList: this.detail.goods,
liveStatus: {
'101': {
img: this.$IMG_URL + '/imgs/live/live.png',
title: '直播中'
},
'102': {
img: this.$IMG_URL + '/imgs/live/prevue.png',
title: '未开始'
},
'103': {
img: this.$IMG_URL + '/imgs/live/playback.png',
title: '已结束'
},
'104': {
img: this.$IMG_URL + '/imgs/live/104.png',
title: '禁播'
},
'105': {
img: this.$IMG_URL + '/imgs/live/105.png',
title: '暂停中'
},
'106': {
img: this.$IMG_URL + '/imgs/live/106.png',
title: '异常'
},
'107': {
img: this.$IMG_URL + '/imgs/live/past.png',
title: '已过期'
}
}
};
},
props: {
detail: {
type: Object,
default: null
},
wh: {
type: Number,
default: 345
},
type: {
type: [Number, String],
default: 2
}
},
computed: {},
created() {
this.getLiveStatus();
},
mounted() {
let that = this;
timer = setInterval(() => {
that.getLiveStatus();
}, 60000);
},
beforeDestroy() {
timer = null;
clearInterval(timer);
},
methods: {
goRoom() {
let that = this;
wx.navigateTo({
url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${that.detail.room_id}`
});
},
// 轮询liveStatus
getLiveStatus() {
if (HAS_LIVE) {
let that = this;
let date = '';
if (that.liveState == 102) {
date = that.$u.timeFormat(that.detail.starttime, 'mm-dd hh:MM');
that.liveStatus['102'].title = '预告 ' + date;
}
livePlayer
.getLiveStatus({ room_id: that.detail.room_id })
.then(res => {
// 101: 直播中, 102: 未开始, 103: 已结束, 104: 禁播, 105: 暂停中, 106: 异常,107:已过期
that.liveState = res.liveStatus;
})
.catch(err => {
console.log('get live status', err);
});
}
}
}
};
</script>
<style lang="scss">
// 小卡片
.sp-live-card {
width: 335rpx;
box-shadow: 0px 0px 10rpx 4rpx rgba(199, 199, 199, 0.22);
border-radius: 20rpx;
height: 100%;
overflow: auto;
}
.live-content {
position: relative;
width: 335rpx;
height: 335rpx;
overflow: hidden;
.item-cover {
background-color: #eee;
width: 100%;
height: 100%;
border-radius: 20rpx 20rpx 0 0;
}
.item-status {
position: absolute;
top: 20rpx;
left: 10rpx;
height: 40rpx;
background: rgba(0, 0, 0, 0.4);
border-radius: 20rpx;
display: flex;
justify-content: center;
align-items: center;
.status-img {
width: 40rpx;
height: 40rpx;
}
.status-text {
font-size: 22rpx;
font-weight: 500;
color: rgba(255, 255, 255, 1);
padding: 0 10rpx;
}
}
.item-title {
width: 335rpx;
position: absolute;
bottom: 0;
line-height: 60rpx;
padding: 0 20rpx;
font-size: 26rpx;
font-weight: 500;
color: rgba(255, 255, 255, 1);
background: linear-gradient(transparent, rgba(#000, 0.5));
padding-right: 60rpx;
}
.like-img {
position: absolute;
bottom: 20rpx;
right: 10rpx;
width: 60rpx;
height: 130rpx;
}
}
.live-bottom {
background-color: #fff;
padding: 20rpx;
width: 335rpx;
.live-info {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
.info-box {
display: flex;
align-items: center;
}
.info-avatar {
width: 40rpx;
height: 40rpx;
border-radius: 50%;
margin-right: 10rpx;
background: #eee;
}
.info-name {
width: 150rpx;
font-size: 24rpx;
font-weight: 500;
color: rgba(51, 51, 51, 1);
}
.views {
font-size: 20rpx;
font-weight: 400;
color: rgba(153, 153, 153, 1);
}
}
.live-goods {
display: flex;
align-items: center;
margin-top: 20rpx;
&__item {
position: relative;
width: 96rpx;
height: 96rpx;
border: 1rpx solid rgba(238, 238, 238, 1);
border-radius: 10rpx;
overflow: hidden;
margin-right: 8rpx;
&:nth-child(3n) {
margin-right: 0;
}
}
&__img {
background: #eee;
width: 100%;
height: 100%;
}
&__price {
position: absolute;
bottom: 0;
line-height: 40rpx;
width: 100%;
background: linear-gradient(transparent, rgba(#000, 0.5));
font-size: 20rpx;
color: #fff;
}
&__mark {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
margin: auto;
display: flex;
justify-content: center;
align-items: center;
background: rgba(#000, 0.3);
font-size: 24rpx;
font-weight: 500;
color: rgba(255, 255, 255, 1);
}
}
}
// 单个大图直播
.big-card-wrap {
.content-one__item {
position: relative;
height: 280rpx;
border-radius: 20rpx;
margin-top: 16rpx;
overflow: hidden;
.item-cover {
background-color: #eee;
width: 100%;
height: 100%;
}
.item-status {
position: absolute;
top: 20rpx;
left: 10rpx;
height: 40rpx;
background: rgba(0, 0, 0, 0.4);
border-radius: 20rpx;
display: flex;
justify-content: center;
align-items: center;
.status-img {
width: 38rpx;
height: 38rpx;
}
.status-text {
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 500;
color: rgba(255, 255, 255, 1);
padding: 0 10rpx;
}
}
.item-title {
width: 100%;
position: absolute;
bottom: 0;
line-height: 60rpx;
padding: 0 20rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: rgba(255, 255, 255, 1);
background: linear-gradient(transparent, rgba(#000, 0.5));
}
.like-img {
position: absolute;
bottom: 20rpx;
right: 10rpx;
width: 60rpx;
height: 130rpx;
}
}
}
</style>

查看文件

@@ -44,23 +44,23 @@
refuseNum: '', //拒绝次数,
authList: {
'WRITE_EXTERNAL_STORAGE': {
title: "《雄戈小酒》对存储空间/照片权限申请说明",
title: "《橙虎小酒》对存储空间/照片权限申请说明",
content: "便于您使用该功能上传您的照片/图片/视频及用于更换头像、意见反馈、保存相册、发布商品/分享、下载与客服沟通等场景中读取和写入相册和文件内容。"
},
'ACCESS_FINE_LOCATION': {
title: "《雄戈小酒》对地理位置权限申请说明",
title: "《橙虎小酒》对地理位置权限申请说明",
content: "便于应用程序可以提供基于位置的服务、定位导航、附近搜索等功能。"
},
'CAMERA': {
title: "《雄戈小酒》对相机/摄像头权限申请说明",
title: "《橙虎小酒》对相机/摄像头权限申请说明",
content: "便于您使用该功能拍照上传您的照片/视频及用于更换头像、意见反馈、保存相册、发布商品/动态、下载与客服沟通等场景中使用"
},
'RECORD_AUDIO': {
title: "《雄戈小酒》对麦克风权限申请说明",
title: "《橙虎小酒》对麦克风权限申请说明",
content: "便于您使用该功能进行录音、语音通话、发布语音、与客服语音沟通等场景中使用"
},
'CALL_PHONE': {
title: "《雄戈小酒》对拨打/管理电话权限申请说明",
title: "《橙虎小酒》对拨打/管理电话权限申请说明",
content: "便于您使用该功能联系买家、骑手或者客服、业务经理与联系等场景下使用"
}
}

查看文件

@@ -6,7 +6,7 @@
---
**Project:** 雄戈小酒
**Project:** 橙虎小酒
**Generated:** 2026-08-27 21:00:42
**Category:** Luxury/Premium Brand
**Design Dials:** Variance 2/10 (Centered / Minimal) | Motion 2/10 (Subtle) | Density 3/10 (Spacious)

查看文件

@@ -6,4 +6,3 @@ export const BASE_URL = 'https://xgsc.gynhc.com' //后台根域名 https://demo.
export const API_URL = `${BASE_URL}/addons/shopro/` //后台接口域名
export const IMG_URL = 'https://xgsc.gynhc.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss
export const MAP_KEY = '24eb092b2163da8fa5087bf92844a5bd'; //高德地图开发者Web服务key,逆坐标解析
export const HAS_LIVE = false //后台是否开通直播权限,根据情况在manifest.json中,开启注释相应组件的引入,pages.json中打开直播

查看文件

@@ -1,7 +1,7 @@
{
"name" : "雄戈小酒",
"name" : "橙虎小酒",
"appid" : "__UNI__F195040",
"description" : "雄戈小酒",
"description" : "橙虎小酒",
"versionName" : "1.3.9",
"versionCode" : 137,
"transformPx" : false,
@@ -31,7 +31,6 @@
"Maps" : {},
"OAuth" : {},
"VideoPlayer" : {},
"LivePusher" : {},
"Record" : {},
"Share" : {},
"Payment" : {},

查看文件

@@ -79,36 +79,6 @@
"group": "商城"
}
},
{
"path": "pages/live/list",
"name": "video",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": true
},
"meta": {
"auth": false,
"async": true,
"title": "直播",
"group": "直播"
}
},
{
"path": "pages/live/list2",
"name": "video",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom",
"enablePullDownRefresh": false
},
"meta": {
"auth": false,
"async": true,
"title": "直播",
"group": "直播"
}
},
{
"path": "pages/index/protocol",
"style": {
@@ -268,18 +238,6 @@
{
"root": "pages/app",
"pages": [
// {
// "path": "live/list",
// "style": {
// "navigationBarTitleText": "直播列表"
// },
// "meta": {
// "auth": false,
// "async": false,
// "title": "直播列表",
// "group": "直播"
// }
// },
{
"path": "store/index",
"style": {
@@ -305,33 +263,6 @@
"group": "门店"
}
},
{
"path": "video/index",
"style": {
"navigationBarTitleText": "视频列表",
"enablePullDownRefresh": true
},
"meta": {
"auth": false,
"async": true,
"title": "视频列表",
"group": "视频"
}
},
{
"path": "video/detail",
"style": {
"navigationBarTitleText": "视频详情",
"navigationStyle": "custom",
"enablePullDownRefresh": false
},
"meta": {
"auth": false,
"async": true,
"title": "视频详情",
"group": "视频"
}
},
{
"path": "score/list",
"style": {
@@ -975,23 +906,6 @@
"group": "用户"
}
},
{
"path": "live",
"style": {
"navigationStyle": "custom",
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false,
"scrollIndicator": "none"
}
},
"meta": {
"auth": true,
"async": true,
"title": "开启直播",
"group": "直播"
}
},
{
"path": "set",
"style": {
@@ -1200,7 +1114,7 @@
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "雄戈小酒",
"navigationBarTitleText": "橙虎小酒",
"navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor": "#F5F7FA"
},
@@ -1221,13 +1135,6 @@
"iconPath": "static/images/tabbar/tabbar_category.png",
"selectedIconPath": "/static/images/tabbar/tabbar_category1.png"
},
// {
// // "pagePath": "pages/live/list",
// "pagePath": "pages/live/list2",
// "text": "直播",
// "iconPath": "static/images/tabbar/tabbar_video.png",
// "selectedIconPath": "/static/images/tabbar/tabbar_video1.png"
// },
{
"pagePath": "pages/index/cart",
"text": "购物车",

查看文件

@@ -1,163 +0,0 @@
<template>
<view>
<view class="video">
<video id="video" @play="handlePlayVideo" :title="detail.title" :src="$IMG_URL + detail.video"
controls></video>
</view>
<view class="content">
<view class="title">{{detail.title}}</view>
<view class="views">
<view class="left">
<view class="icon">
<image :src="$IMG_URL + '/assets/img/views_num.png'" mode=""></image>
<view class="num">{{detail.views}}</view>
</view>
<view class="icon">
<image :src="$IMG_URL + '/assets/img/play_num.png'" mode=""></image>
<view class="num">{{detail.play_num}}</view>
</view>
</view>
<view class="right">
{{detail.create_time}}
</view>
</view>
<view class="detail">
<view class="detail-title">
<image :src="$IMG_URL + '/assets/img/detail.png'" mode=""></image>
<view class="detail-text">视频详细介绍</view>
</view>
</view>
<view class="box" v-if="detail.content">
<u-parse :html="detail.content"></u-parse>
</view>
</view>
</view>
</template>
<script>
export default {
components: {},
data() {
return {
detail: [],
isPlayNum: false
};
},
computed: {},
onLoad(o) {
this.getVideoDetail(o.id);
},
methods: {
// 获取视频详情
getVideoDetail(id) {
uni.showLoading({
title: '正在加载中...'
})
this.$http('video.detail', {
id
}).then(res => {
uni.hideLoading();
this.detail = res.data;
});
},
handlePlayVideo(e) {
// 统计播放量
if (!this.isPlayNum) {
this.$http('video.playNum', {
id: this.detail.id
}).then(res => {
this.isPlayNum = true;
this.$set(this.detail, 'play_num', parseInt(this.detail.play_num) + 1);
});
}
},
}
};
</script>
<style>
page {
background: #fff;
}
._image {
display: block;
width: 100%;
height: 360px;
margin-top: -360px;
opacity: 0;
}
#video {
width: 100%;
height: 570rpx;
}
.content {
margin: 20rpx;
}
.content .title {
font-size: 30rpx;
font-weight: bold;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
margin-bottom: 30rpx;
}
.content .views {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 50rpx;
}
.content .left {
display: flex;
align-items: center;
}
.content .left .icon {
display: flex;
align-items: center;
margin-right: 30rpx;
}
.content .left .icon image {
width: 42rpx;
height: 42rpx;
margin-right: 10rpx;
}
.content .left .icon {
color: #333;
font-size: 26rpx;
}
.content .right {
color: #a9a7a7;
font-size: 26rpx;
}
.detail {
margin: 30rpx 0;
}
.detail .detail-title {
display: flex;
align-items: center;
}
.detail .detail-title image {
width: 48rpx;
height: 48rpx;
margin-right: 10rpx;
}
.detail .detail-title .detail-text {
font-size: 32rpx;
font-weight: bold;
}
</style>

查看文件

@@ -1,169 +0,0 @@
<template>
<view>
<view v-if="list.length" class="box">
<view v-for="(item, index) of list" class="list" :key="index" @tap="$Router.push({ path: '/pages/app/video/detail', query: { id: item.id } })">
<view class="left">
<image :src="$IMG_URL + item.image" mode=""></image>
</view>
<view class="right">
<view class="title">{{item.title}}</view>
<view class="desc">{{item.desc}}</view>
<view class="bottom">
<view class="icon">
<image :src="$IMG_URL + '/assets/img/views_num.png'" mode=""></image>
<view class="num">{{item.views}}</view>
</view>
<view class="icon">
<image :src="$IMG_URL + '/assets/img/play_num.png'" mode=""></image>
<view class="num">{{item.play_num}}</view>
</view>
</view>
</view>
</view>
<view v-if="page < totalSize" class="loading">
<image :src="$IMG_URL + '/assets/img/loading-x.gif'" mode=""></image>
<view class="loading-text">正在加载中...</view>
</view>
</view>
<view v-else class="empty">
<u-empty text="暂无视频" mode="list"></u-empty>
</view>
</view>
</template>
<script>
export default {
components: {},
data() {
return {
page: 1,
list: [],
totalSize: 1,
total: 0,
rows: 10
};
},
computed: {},
onLoad() {
this.getVideoList();
},
// 触底事件
onReachBottom() {
// 加载更多
if (this.page < this.totalSize) {
this.page += 1;
this.getVideoList();
}
},
methods: {
// 获取视频列表
getVideoList() {
this.$http('video.index', {
page: this.page
}).then(res => {
// 合并数据
this.list = [...this.list, ...res.data.list];
// 总页数
this.totalSize = res.data.totalSize;
// 总数据
this.total = res.data.total;
});
}
}
};
</script>
<style>
page {
background: #fff;
}
.empty {
margin-top: 80rpx;
}
.loading {
display: flex;
align-items: center;
justify-content: center;
}
.loading image {
width: 120rpx;
height: 120rpx;
}
.loading .loading-text {
font-size: 28rpx;
color: #333;
}
.box {
margin: 20rpx;
padding-bottom: 40rpx;
}
.box .list {
display: flex;
margin-bottom: 30rpx;
border-bottom: 2rpx solid #f5f3f3;
padding-bottom: 20rpx;
}
.box .list:last-child {
border: none;
}
.box .list .left {
margin-right: 20rpx;
}
.box .list .left image {
width: 310rpx;
height: 200rpx;
border-radius: 10rpx;
}
.box .list .right .title {
font-size: 26rpx;
font-weight: bold;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
margin-bottom: 10rpx;
}
.box .list .right .desc {
font-size: 24rpx;
color: #bfbfbf;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
margin-bottom: 10rpx;
height: 100rpx;
}
.box .list .bottom {
display: flex;
align-items: center;
}
.box .list .bottom .icon {
display: flex;
align-items: center;
margin-right: 30rpx;
}
.box .list .bottom .icon image {
width: 42rpx;
height: 42rpx;
margin-right: 10rpx;
}
.box .list .bottom .icon {
color: #333;
font-size: 26rpx;
}
</style>

查看文件

@@ -85,7 +85,6 @@ const TOOL_NAME_ALIAS = {
const EXTRA_ICON_MAP = {
'在线客服': 'uicon-server-man',
'开启直播': 'uicon-play-circle',
'我的预约': 'uicon-calendar'
};
@@ -122,7 +121,7 @@ export default {
Object.keys(apiMap).forEach(name => {
if (catalogNames.includes(name)) return;
if (name === '开启直播' && this.userInfo?.is_live != 1) return;
if (name === '开启直播') return;
const remote = apiMap[name];
merged.push({
name,
@@ -135,7 +134,7 @@ export default {
return merged.filter(item => {
if (isHiddenTool(item)) return false;
return item.name !== '开启直播' || this.userInfo?.is_live == 1;
return item.name !== '开启直播';
});
}
},
@@ -155,9 +154,6 @@ export default {
if (data.name === '我的预约' && !data.path) {
data.path = '/pages/user/rob-order';
}
if (data.name === '开启直播' && !data.path) {
data.path = '/pages/user/live';
}
if (!data.path) {
uni.showToast({ title: '功能暂未开放', icon: 'none' });
return;

查看文件

@@ -1,108 +0,0 @@
<template>
<view class="live-el u-m-p-20 u-m-b-10" v-if="showLive">
<view class="head">
<text class="head-title">{{ detail.name }}</text>
<view class="head-more u-flex u-col-center" @tap="$Router.push('/pages/app/live/list')">
<text class="u-m-r-10 more-text">更多直播</text>
<text class="iconfont icon-youjiantou-tianchong more-icon"></text>
</view>
</view>
<!-- 大图 -->
<view v-if="liveType == 1" v-for="live in liveList" :key="live.id"><shopro-live-card :type="1" :detail="live"></shopro-live-card></view>
<!-- 小图 -->
<view class="content-two" v-if="liveType == 2">
<view class="content-two__item" v-for="live in liveList" :key="live.id">
<shopro-live-card :type="2" :detail="live" :wh="345">
<block slot="liveGoods"><text></text></block>
</shopro-live-card>
</view>
</view>
</view>
</template>
<script>
/**
* 自定义之直播卡片
* @property {Object} detail - 直播信息
*/
export default {
components: {},
data() {
return {
liveList: [],
showLive: this.detail.ids,
liveType: this.detail.style
};
},
props: {
detail: {}
},
created() {
this.showLive && this.getLiveList();
},
computed: {},
methods: {
// 直播列表
getLiveList() {
let that = this;
that.$http('common.live', {
type: 'all',
ids: that.detail.ids
}).then(res => {
if (res.code === 1) {
that.liveList = res.data;
}
});
},
goRoom(live) {
wx.navigateTo({
url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${live.room_id}`
});
}
}
};
</script>
<style lang="scss">
.live-el {
background: #fff;
padding: 30rpx 20rpx;
.head {
display: flex;
justify-content: space-between;
align-items: center;
&-title {
font-size: 32rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
}
&-more {
.more-text {
font-size: 22rpx;
font-weight: 500;
color: #333333;
}
.more-icon {
font-size: 24rpx;
color: #333333;
}
}
}
// 双图直播
.content-two {
width: 710rpx;
display: flex;
flex-wrap: wrap;
&__item {
margin-right: 20rpx;
margin-top: 20rpx;
width: 345rpx;
&:nth-child(2n) {
margin-right: 0;
}
}
}
}
</style>

查看文件

@@ -31,9 +31,6 @@
<sh-seckill v-if="item.type === 'seckill'" :detail="item.content"></sh-seckill>
<sh-groupon v-if="false && item.type === 'groupon'" :detail="item.content"></sh-groupon>
<sh-richtext v-if="item.type === 'rich-text'" :richId="item.content.id"></sh-richtext>
<!-- #ifdef MP-WEIXIN -->
<sh-live v-if="item.type === 'live' && HAS_LIVE" :detail="item.content"></sh-live>
<!-- #endif -->
</block>
</view>
<!-- 1+3 业务专区 -->
@@ -89,13 +86,6 @@
import ShoproProtocol from '@/components/shopro-protocol/shopro-protocol.vue'
import checkVersion from '@/pages/lq-upgrade/checkVersion.js'
// #ifdef MP-WEIXIN
import {
HAS_LIVE
} from '@/env';
import shLive from './components/sh-live.vue';
// #endif
import {
mapMutations,
mapActions,
@@ -119,16 +109,10 @@
privacyModal,
homeHead,
homeZoneGrid,
ShoproProtocol,
// #ifdef MP-WEIXIN
shLive
// #endif
ShoproProtocol
},
data() {
return {
// #ifdef MP-WEIXIN
HAS_LIVE: HAS_LIVE,
// #endif
isRefresh: true,
enable: false, //是否开启吸顶。

查看文件

@@ -8,7 +8,7 @@
<view class="brand-block">
<text class="brand-title u-ellipsis-1">{{ navTitle || '雄戈小酒' }}</text>
<text class="brand-title u-ellipsis-1">{{ navTitle || '橙虎小酒' }}</text>
<text class="brand-tagline u-ellipsis-1">臻选酱香 · 品质生活</text>
@@ -172,7 +172,7 @@ export default {
type: String,
default: '雄戈小酒'
default: '橙虎小酒'
}

查看文件

@@ -23,7 +23,7 @@
<sh-cell v-if="item.type === 'nav-list'" :list="item.content.list"></sh-cell>
<!-- 九宫格列表 -->
<view class="" style="width: 100%;padding-left: 20rpx;padding-right: 20rpx;box-sizing: border-box;">
<sh-grid v-if="item.type === 'grid-list'" :isLive="userData.is_live" :list="item.content.list"></sh-grid>
<sh-grid v-if="item.type === 'grid-list'" :list="item.content.list"></sh-grid>
</view>
<!-- 钱包 -->
<view class="" style="width: 100%;padding-left: 20rpx;padding-right: 20rpx;box-sizing: border-box;">

查看文件

@@ -49,10 +49,6 @@
<sh-wallet v-if="item.type === 'wallet-card'"></sh-wallet>
<!-- 订单卡片 -->
<sh-order-card v-if="item.type === 'order-card'"></sh-order-card>
<!-- 直播 -->
<!-- #ifdef MP-WEIXIN -->
<sh-live v-if="item.type === 'live' && HAS_LIVE" :detail="item.content"></sh-live>
<!-- #endif -->
</block>
</view>
<!-- 分类选项卡 -->
@@ -102,13 +98,6 @@
} from 'vuex';
import { filterHiddenTools } from '@/shopro/utils/hidden-tools';
// #ifdef MP-WEIXIN
import {
HAS_LIVE
} from '@/env';
import shLive from './components/sh-live.vue';
// #endif
// #ifdef H5
let listenMove = document.body; //禁止手机h5下拉刷新带动整个页面。
let handle = function(e) {
@@ -134,17 +123,11 @@
shSearch,
shCategoryTabs,
shoproLoading,
shPicAds,
// #ifdef MP-WEIXIN
shLive
// #endif
shPicAds
},
data() {
return {
pageData: false,
// #ifdef MP-WEIXIN
HAS_LIVE: HAS_LIVE,
// #endif
enable: false, //是否开启吸顶。
isScorll: false,
viewTemplate: [], //自定义模板数据

查看文件

@@ -1,216 +0,0 @@
<!-- 直播列表 -->
<template>
<view class="page_box">
<view class="head_box">
<view class="live-tab">
<view class="live-tab__item" v-for="tab in liveTab" :key="tab.title" @tap="selTab(tab.title)">
<view class="live-tab__item-name">{{ tab.name }}</view>
<text class="live-tab__item--link" :class="{ 'live-tab__item--active': tabCur === tab.title }"></text>
</view>
</view>
</view>
<view class="content_box">
<scroll-view enable-back-to-top scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
<view class="u-waterfall" v-if="!isEmpty">
<view id="u-left-column" class="u-column">
<view class="u-flex u-row-center u-col-center u-m-b-20" v-for="live in leftList" :key="live.id">
<shopro-live-card :type="2" :detail="live"></shopro-live-card>
</view>
</view>
<view id="u-left-column" class="u-column">
<view class="u-flex u-row-center u-col-center u-m-b-20" v-for="live in rightList" :key="live.id">
<shopro-live-card :type="2" :detail="live"></shopro-live-card>
</view>
</view>
</view>
<!-- 更多 -->
<u-loadmore v-if="!isEmpty" height="80rpx" :status="loadStatus" color="#ccc" />
<!-- 置空页 -->
<u-empty :show="isEmpty" mode="list"></u-empty>
</scroll-view>
</view>
</view>
</template>
<script>
export default {
components: {},
data() {
return {
tabCur: 'all',
isEmpty: false,
liveTab: [
{
title: 'all',
name: '全部'
},
{
title: 'notice',
name: '预告'
},
{
title: 'living',
name: '直播中'
},
{
title: 'lived',
name: '已结束'
}
],
liveList: [],
loadStatus: 'loadmore', //loadmore-加载前的状态,loading-加载中的状态,nomore-没有更多的状态
currentPage: 1,
lastPage: 1,
// 瀑布流 300-220
addTime: 100, //排序间隙时间
leftHeight: 0,
rightHeight: 0,
leftList: [],
rightList: [],
tempList: []
};
},
computed: {},
onLoad() {
this.getLiveList();
},
onHide() {},
methods: {
// 瀑布流相关
async splitData() {
if (!this.tempList.length) return;
let item = this.tempList[0];
if (!item) return;
// 分左右
if (this.leftHeight < this.rightHeight) {
this.leftHeight += item.goods.length ? 300 : 220;
this.leftList.push(item);
} else if (this.leftHeight > this.rightHeight) {
this.rightHeight += item.goods.length ? 300 : 220;
this.rightList.push(item);
} else {
this.leftHeight += item.goods.length ? 300 : 220;
this.leftList.push(item);
}
// 移除临时列表的第一项,如果临时数组还有数据,继续循环
this.tempList.splice(0, 1);
if (this.tempList.length) {
setTimeout(() => {
this.splitData();
}, this.addTime);
}
},
clear() {
this.leftList = [];
this.rightList = [];
this.leftHeight = 0;
this.rightHeight = 0;
this.tempList = [];
},
// 切换tab
selTab(cur) {
if (this.tabCur !== cur) {
this.tabCur = cur;
this.liveList = [];
this.currentPage = 1;
this.lastPage = 1;
this.clear();
this.getLiveList();
}
},
// 加载更多
loadMore() {
if (this.currentPage < this.lastPage) {
this.currentPage += 1;
this.getLiveList();
}
},
// 直播列表
getLiveList() {
let that = this;
that.loadStatus = 'loading';
that.$http('common.live', {
type: that.tabCur,
page: that.currentPage
}).then(res => {
if (res.code === 1) {
that.liveList = [...that.liveList, ...res.data.data];
that.isEmpty = !that.liveList.length;
that.lastPage = res.data.last_page;
that.loadStatus = that.currentPage < res.data.last_page ? 'loadmore' : 'nomore';
that.tempList = res.data.data;
that.splitData();
}
});
}
}
};
</script>
<style lang="scss">
@mixin vue-flex($direction: row) {
/* #ifndef APP-NVUE */
display: flex;
flex-direction: $direction;
/* #endif */
}
.u-waterfall {
@include vue-flex;
flex-direction: row;
align-items: flex-start;
}
.u-column {
@include vue-flex;
flex: 1;
flex-direction: column;
height: auto;
}
// tab
.live-tab {
width: 100%;
height: 96rpx;
background: #fff;
display: flex;
&__item {
flex: 1;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
}
&__item-name {
font-size: 28rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
flex: 1;
display: flex;
justify-content: center;
align-items: center;
}
&__item--link {
width: 68rpx;
height: 4rpx;
background: transparent;
border-radius: 2rpx;
}
&__item--active {
width: 68rpx;
height: 4rpx;
background: $brand-primary;
border-radius: 2rpx;
}
}
// 瀑布流 list
.scroll-box {
margin: 20rpx auto;
width: 730rpx;
}
</style>

查看文件

@@ -1,99 +0,0 @@
<template>
<view>
<template v-if="infoData.live == 1">
<video :src="infoData.liveUrl" :controls="false" autoplay
:style="{width: width + 'px',height:height + 'px'}">
</video>
<image style="width: 20px;height: 20px;position: fixed;top: 20px;left: 20px;" @click="backHome" src="../../static/live-back.png"></image>
</template>
<!-- <div class="live-box" v-else>
<image src="../../static/template_empty.png" style="width: 500rpx;" mode="widthFix"></image>
<text class="zwzb">暂无直播~</text>
</div> -->
<view class="empty-live" v-else>
<text style="color: lawngreen;
font-size: 40rpx;
font-weight: bold;">直播已结束</text>
<image src="../../static/live-icon.jpg" mode="" style="width: 140rpx;height: 140rpx;border-radius: 50%;margin-top: 100rpx;"></image>
<text style="color: #fff;margin-top: 10rpx;font-size: 24rpx;">雄戈小酒</text>
<view @click="backHome" style="position: absolute;bottom: 140rpx;width: 600rpx;height: 88rpx;background-color: #fff;border-radius: 60rpx;text-align: center;line-height: 88rpx;display: flex;align-items: center;justify-content: center;">
返回首页
</view>
</view>
<shopro-tabbar></shopro-tabbar>
</view>
</template>
<script>
export default {
data() {
return {
width: '',
height: '',
infoData: {}
}
},
methods: {
backHome() {
uni.switchTab({
url: '/pages/index/index'
})
},
getVideo(flag) {
const data = {}
if(flag) data.check = 1
uni.$http('common.getVideoUrl',data).then(res => {
if(flag) {
this.infoData.live = res.data.live
}else {
this.infoData = res.data
}
setTimeout(() => {
this.getVideo(true)
},5000)
}).catch(err => {
})
}
},
onShow() {
let info = uni.getSystemInfoSync()
this.width = info.windowWidth
this.height = info.windowHeight
this.getVideo()
}
}
</script>
<style scoped>
.live-box {
align-items: center;
padding-top: 200rpx;
}
.empty-live .title{
}
.empty-live{
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #000;
align-items: center;
flex-direction: column;
padding-top: 100rpx;
}
.zwzb {
margin-top: 50rpx;
text-align: center;
color: #666;
font-size: 40rpx;
}
</style>

查看文件

@@ -119,7 +119,7 @@
</template>
<script>
const HOT_KEYWORDS = ['雄戈小酒', '礼盒装', '品鉴装', '酱香型', '单瓶装', '商务宴请'];
const HOT_KEYWORDS = ['橙虎小酒', '礼盒装', '品鉴装', '酱香型', '单瓶装', '商务宴请'];
export default {
data() {

查看文件

@@ -1,449 +0,0 @@
<template>
<div>
<view :style="{width: width + 'px',height:height + 'px'}" v-if="markact" class="mark">
<text class="mark-text">直播启动中...</text>
</view>
<view>
<view @click="returns" class="arrow-box">
<text class="jiesu">结束直播</text>
</view>
<live-pusher :beauty="beauty" :style="{width: width + 'px',height:height + 'px'}" id="livePusher" :url="url"
mode="FHD"></live-pusher>
<!-- 这是聊天室 -->
<!-- <view class="chat">
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
@scrolltolower="lower" @scroll="scroll">
<view class="chat-list" v-for="(it,i) in chatList" :key='i'>
<text class="chat-username">{{it.name}}:</text>
<text class="chat-usertext">{{it.text}}</text>
</view>
</scroll-view>
</view> -->
<!-- 这是功能按钮 -->
<view :style="{width: width + 'px'}" class="but">
<!-- <view @click="openMark(0)" class="meiyanbut">
<image class="but-img" src="../../static/zhiboshop.png"></image>
<text class="but-text">宝贝</text>
</view> -->
<view @click="openmeiyan" class="meiyanbut">
<image class="but-img" src="../../static/meiyan.png"></image>
<text v-if="beauty == 0" class="but-text">开启美颜</text>
<text v-if="beauty == 9" class="but-text">关闭美颜</text>
</view>
<view @click="switchCamera" class="meiyanbut">
<image class="but-img" src="../../static/qiehuan.png"></image>
<text class="but-text">切换摄像头</text>
</view>
</view>
<uni-popup ref="popup" type="bottom">
<!-- 这是商品弹窗 -->
<view class="shop-list-box" :style="{width: width + 'px'}" v-if="type == 0">
<text :style="{width: width + 'px'}" class="mark-title">直播商品</text>
<text @click="add()" class="add-shop">添加商品</text>
<scroll-view :style="{width: width + 'px'}" :scroll-top="scrollTop" scroll-y="true"
class="scroll-Ys" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll">
<view class="shop-list-list" v-for="(it,i) in shopArr" :key='i'>
<view>
<image class="shop-list-img" :src="it.img"></image>
</view>
<view>
<text class="shop-list-title">{{it.title}}</text>
<text class="shop-list-num">剩余{{it.num}}件</text>
<text class="shop-list-price">¥{{it.price}}</text>
</view>
<view class="shop-list-but-box">
<text class="shop-list-but">移除</text>
</view>
</view>
</scroll-view>
</view>
</uni-popup>
</view>
<!-- <u-modal :show="show" content='是否结束直播'></u-modal> -->
</div>
</template>
<script>
import uniPopup from "@/components/uni-popup/uni-popup.vue"
export default {
components: {
uniPopup
},
data() {
return {
show: false,
type: "",
width: '',
height: '',
url: '', //这是推流地址
enableCamera: false,
context: null,
markact: true,
arr: [],
shopArr: [{
img: '../../static/logo.png',
title: '测试商品',
price: '111',
num: '20',
},
{
img: '../../static/logo.png',
title: '测试商品',
price: '111',
num: '20',
},
{
img: '../../static/logo.png',
title: '测试商品',
price: '111',
num: '20',
},
{
img: '../../static/logo.png',
title: '测试商品',
price: '111',
num: '20',
},
{
img: '../../static/logo.png',
title: '测试商品',
price: '111',
num: '20',
}
],
chatList: [{
name: '用户01',
text: '哈哈哈哈哈'
},
{
name: '用户01',
text: '哈哈哈哈哈'
},
{
name: '用户01',
text: '哈哈哈哈哈'
},
{
name: '用户01',
text: '哈哈哈哈哈'
},
{
name: '用户01',
text: '哈哈哈哈哈'
},
{
name: '用户01',
text: '哈哈哈哈哈'
},
{
name: '用户01',
text: '哈哈哈哈哈'
},
{
name: '用户01',
text: '哈哈哈哈哈'
}
],
beauty: 0
};
},
onLoad() {
let info = uni.getSystemInfoSync()
this.width = info.windowWidth;
this.height = info.windowHeight;
uni.$http('common.getLiveAddr').then(res => {
this.url = res.data.liveUrl
})
},
onReady() {
this.context = uni.createLivePusherContext('livePusher', this);
setTimeout(() => {
this.startLive();
}, 1000)
},
methods: {
add() {
console.log('s')
},
// 0是宝贝弹窗,1是订单弹窗,2是工具弹窗,3是设置弹窗
openMark(type) {
this.type == type
this.$refs.popup.open()
},
openmeiyan() {
// this.$refs.popup.open()
if (this.beauty == 0) {
this.beauty = 9
} else {
this.beauty = 0
}
},
returns() {
let that = this
uni.showModal({
content: "是否结束直播",
cancelText: "取消",
confirmText: "结束",
success: (res) => {
if (res.confirm) {
that.stopLive()
}
}
})
// this.stopLive();
// uni.navigateBack({
// delta: 1
// })
},
EnableCamera() {
this.enableCamera = true;
},
startLive() {
let self = this;
this.context.start({
success: a => {
self.markact = false;
console.log('livePusher.start:' + JSON.stringify(a));
}
});
},
stopLive() {
uni.$http('common.endLive').then(res => {
uni.navigateBack()
})
// this.context.stop({
// success: a => {
// console.log(JSON.stringify(a));
// }
// });
},
switchCamera() {
this.context.switchCamera({
success: (a) => {
console.log("livePusher.switchCamera:" + JSON.stringify(a));
}
});
}
}
}
</script>
<style>
.add-shop {
font-size: 16px;
color: #333333;
position: absolute;
top: 20px;
left: 20px;
z-index: 10;
}
.shop-list-but-box {
position: absolute;
bottom: 10px;
right: 20px;
display: flex;
align-items: center;
justify-content: flex-end;
flex-direction: row;
}
.shop-list-but {
color: white;
border-radius: 2px;
font-size: 16px;
background-color: #D4237A;
padding: 10px 20px 10px 20px;
}
.mark-title {
padding-top: 20px;
padding-bottom: 20px;
text-align: center;
font-size: 20px;
}
.shop-list-img {
margin-right: 10px;
width: 100px;
height: 100px;
}
.shop-list-title {
font-size: 20px;
color: #333333;
}
.shop-list-num {
font-size: 16px;
color: #C0C0C0;
padding-top: 10px;
}
.shop-list-price {
font-size: 16px;
color: #D4237A;
padding-top: 10px;
}
.scroll-Ys {
background-color: white;
height: 300px;
width: 100%;
}
.shop-list-box {
position: relative;
background-color: white;
width: 100%;
height: 380px;
}
.shop-list-list {
position: relative;
padding-top: 5px;
padding-bottom: 5px;
display: flex;
align-items: flex-start;
flex-direction: row;
}
.chat-username {
font-size: 18px;
color: white;
}
.chat-usertext {
font-size: 16px;
color: white;
}
.chat-list {
margin-top: 5px;
display: flex;
align-items: center;
justify-content: flex-start;
flex-direction: row;
background-color: rgba(0, 0, 0, .5);
padding: 5px 10px 5px 10px;
border-radius: 3px;
}
.scroll-Y {
height: 150px;
width: 250px;
}
.chat {
position: fixed;
z-index: 10;
bottom: 80px;
}
.but-img {
width: 20px;
height: 20px;
}
.meiyanbut {
padding: 10px 20px 10px 20px;
margin-left: 20px;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.but-text {
padding-top: 3px;
font-size: 13px;
color: white;
}
.id {
font-size: 14px;
color: white;
}
.text-box {
font-size: 12px;
color: white;
}
.user-img {
margin-right: 5px;
width: 30px;
height: 30px;
border-radius: 50%;
}
.mark-text {
color: white;
font-size: 20px;
}
.mark {
position: fixed;
top: 0px;
background-color: #000000;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.but {
background-color: rgba(0, 0, 0, .4);
position: fixed;
bottom: 0px;
display: flex;
align-items: center;
flex-direction: row;
padding-bottom: 20px;
}
.tui {
width: 200px;
height: 200px;
}
.arrow-box {
position: fixed;
top: 60px;
left: 20px;
z-index: 10;
border-radius: 20px;
background-color: rgba(0, 0, 0, .4);
}
.arrow-boxs {
padding: 10px 20px 10px 20px;
display: flex;
align-items: center;
flex-direction: row;
position: fixed;
top: 60px;
left: 140px;
z-index: 10;
border-radius: 30px;
background-color: rgba(0, 0, 0, .4);
}
.jiesu {
padding: 10px 20px 10px 20px;
color: white;
font-size: 16px;
}
.arrow {
width: 15px;
height: 15px;
}
</style>

查看文件

@@ -1,441 +0,0 @@
<template>
<view>
<view :style="{width: width + 'px',height:height + 'px'}" v-if="showMarkact" class="mark">
<text class="mark-text">直播准备中...</text>
</view>
<live-pusher v-else :beauty="beauty" :whiteness="whiteness" :style="{width: width + 'px',height:height + 'px'}"
id="livePusher" :url="url" mode="FHD"></live-pusher>
<!-- 这是功能按钮 -->
<view :style="{width: width + 'px'}" class="but">
<view @click="handleBackUser" class="meiyanbut">
<image class="but-img" src="../../static/live-back.png"></image>
<text class="but-text">返回</text>
</view>
<view @click="handelBeauty" class="meiyanbut">
<template v-if="beauty == 0">
<image class="but-img" src="../../static/live-love.png"></image>
<text class="but-text">美颜</text>
</template>
<template v-else>
<image class="but-img" src="../../static/live-love-active.png"></image>
<text class="but-text live-text">美颜</text>
</template>
</view>
<view @click="handelOpenLive" class="meiyanbut">
<template v-if="!liveStatus">
<image class="but-img" src="../../static/live-open.png"></image>
<text class="but-text">开播</text>
</template>
<template v-else>
<image class="but-img" src="../../static/live-open-active.png"></image>
<text class="but-text live-text">开播</text>
</template>
</view>
<view @click="handelWhiteness" class="meiyanbut">
<template v-if="whiteness == 0">
<image class="but-img" src="../../static/live-white.png"></image>
<text class="but-text">美白</text>
</template>
<template v-else>
<image class="but-img" src="../../static/live-white-active.png"></image>
<text class="but-text live-text">美白</text>
</template>
</view>
<view @click="handelSwitchCamera" class="meiyanbut">
<template v-if="!camera">
<image class="but-img" src="../../static/live-video.png"></image>
<text class="but-text">切换摄像头</text>
</template>
<template v-else>
<image class="but-img" src="../../static/live-video-active.png"></image>
<text class="but-text live-text">切换摄像头</text>
</template>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
show: false,
type: "",
width: '',
height: '',
url: '', // 这是推流地址
camera: false,
context: null,
showMarkact: true,
liveStatus: false,
beauty: 0,
whiteness: 0
};
},
// 页面加载
onLoad() {
// 获取手机信息
let info = uni.getSystemInfoSync();
this.width = info.windowWidth;
this.height = info.windowHeight;
},
// 页面完成
onReady() {
this.context = uni.createLivePusherContext('livePusher', this);
// setTimeout(() => {
// this.startLive();
// }, 1000)
},
// 页面卸载
onUnload() {
if (this.liveStatus) {
this.handelStopLive();
}
},
methods: {
// 开启关闭直播
handelOpenLive() {
if (!this.liveStatus) {
uni.showModal({
title: '温馨提示',
content: '您是否要开启直播?',
cancelText: '取消',
confirmText: '开启',
success: res => {
if (res.confirm) {
this.handleOpenLive();
}
}
});
} else {
uni.showModal({
title: '温馨提示',
content: '你是否要关闭直播?',
cancelText: '取消',
confirmText: '关闭',
success: res => {
if (res.confirm) {
this.handelStopLive();
}
}
});
}
},
// 返回个人中心
handleBackUser() {
if (this.liveStatus) {
uni.showModal({
title: '温馨提示',
content: '您当前正在直播中是否要返回?',
cancelText: '取消',
confirmText: '返回',
success: res => {
if (res.confirm) {
// this.handelStopLive();
uni.switchTab({
url: '/pages/index/user'
})
}
}
});
} else {
uni.switchTab({
url: '/pages/index/user'
})
}
},
// 开启直播
handleOpenLive() {
uni.showLoading({
title: '直播开启中...',
mask: true,
})
uni.$http('common.getLiveAddr').then(res => {
this.liveStatus = true;
this.showMarkact = false;
this.url = res.data.liveUrl;
this.startLive();
}).finally(() => {
uni.hideLoading();
});
},
// 关闭直播
handelStopLive() {
uni.showLoading({
title: '直播关闭中...',
mask: true,
})
uni.$http('common.endLive').then(res => {
this.liveStatus = false;
this.showMarkact = true;
this.url = '';
this.stopLive();
}).finally(() => {
uni.hideLoading();
});
},
// 美颜
handelBeauty() {
if (this.liveStatus) {
this.beauty = this.beauty == 0 ? 9 : 0
}
},
// 美白
handelWhiteness() {
if (this.liveStatus) {
this.whiteness = this.whiteness == 0 ? 9 : 0
}
},
// 开启推流
startLive() {
let self = this;
self.context.start({
success: res => {
console.log('livePusher.start:' + JSON.stringify(res));
}
});
},
// 停止推流
stopLive: function() {
this.context.stop({
success: res => {
console.log(JSON.stringify(res));
}
});
},
// 切换摄像头
handelSwitchCamera() {
let self = this;
if (self.liveStatus) {
self.context.switchCamera({
success: res => {
console.log(res);
self.camera = true;
console.log("livePusher.switchCamera:" + JSON.stringify(res));
}
});
}
}
}
}
</script>
<style>
.live-text {
color: #f4ea29 !important;
}
.add-shop {
font-size: 16px;
color: #333333;
position: absolute;
top: 20px;
left: 20px;
z-index: 10;
}
.shop-list-but-box {
position: absolute;
bottom: 10px;
right: 20px;
display: flex;
align-items: center;
justify-content: flex-end;
flex-direction: row;
}
.shop-list-but {
color: white;
border-radius: 2px;
font-size: 16px;
background-color: #D4237A;
padding: 10px 20px 10px 20px;
}
.mark-title {
padding-top: 20px;
padding-bottom: 20px;
text-align: center;
font-size: 20px;
}
.shop-list-img {
margin-right: 10px;
width: 100px;
height: 100px;
}
.shop-list-title {
font-size: 20px;
color: #333333;
}
.shop-list-num {
font-size: 16px;
color: #C0C0C0;
padding-top: 10px;
}
.shop-list-price {
font-size: 16px;
color: #D4237A;
padding-top: 10px;
}
.scroll-Ys {
background-color: white;
height: 300px;
width: 100%;
}
.shop-list-box {
position: relative;
background-color: white;
width: 100%;
height: 380px;
}
.shop-list-list {
position: relative;
padding-top: 5px;
padding-bottom: 5px;
display: flex;
align-items: flex-start;
flex-direction: row;
}
.chat-username {
font-size: 18px;
color: white;
}
.chat-usertext {
font-size: 16px;
color: white;
}
.chat-list {
margin-top: 5px;
display: flex;
align-items: center;
justify-content: flex-start;
flex-direction: row;
background-color: rgba(0, 0, 0, .5);
padding: 5px 10px 5px 10px;
border-radius: 3px;
}
.scroll-Y {
height: 150px;
width: 250px;
}
.chat {
position: fixed;
z-index: 10;
bottom: 80px;
}
.but-img {
width: 20px;
height: 20px;
}
.meiyanbut {
padding: 30rpx;
margin-left: 20rpx;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.but-text {
padding-top: 3px;
font-size: 13px;
color: white;
}
.id {
font-size: 14px;
color: white;
}
.text-box {
font-size: 12px;
color: white;
}
.user-img {
margin-right: 5px;
width: 30px;
height: 30px;
border-radius: 50%;
}
.mark-text {
color: white;
font-size: 20px;
}
.mark {
position: fixed;
top: 0;
background-color: #000000;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.but {
background-color: rgba(0, 0, 0, .4);
position: fixed;
bottom: 0;
display: flex;
align-items: center;
flex-direction: row;
padding-bottom: 30rpx;
justify-content: center;
}
.tui {
width: 200px;
height: 200px;
}
.arrow-box {
position: fixed;
top: 60px;
left: 20px;
z-index: 10;
border-radius: 20px;
background-color: rgba(0, 0, 0, .4);
}
.arrow-boxs {
padding: 20rpx 20px 10px 20px;
display: flex;
align-items: center;
flex-direction: row;
position: fixed;
top: 60px;
left: 140px;
z-index: 10;
border-radius: 30px;
background-color: rgba(0, 0, 0, .4);
}
.jiesu {
padding: 10px 20px 10px 20px;
color: white;
font-size: 16px;
}
.arrow {
width: 15px;
height: 15px;
}
</style>

查看文件

@@ -1,4 +1,4 @@
// 雄戈小酒 - 商务蓝白主题(供 JS/template 内联使用)
// 橙虎小酒 - 商务蓝白主题(供 JS/template 内联使用)
export default {
navy: '#0A2463',
navyLight: '#1E3A8A',

查看文件

@@ -40,12 +40,6 @@ export default {
method: "GET",
// desc: '自定义模板页面',
},
live: {
url: "live",
auth: false,
method: "GET",
// desc: '直播列表',
},
wxJssdk: {
url: "wechat/jssdk",
auth: false,
@@ -82,45 +76,6 @@ export default {
method: "POST",
// desc: '发送短信',
},
getLiveAddr: {
url: "live/getLiveAddr",
auth: true,
method: "GET",
// desc: '获取直播推流地址',
},
endLive: {
url: "live/endLive",
auth: true,
method: "GET",
// desc: '结束直播',
},
getVideoUrl: {
url: "live/getVideoUrl",
auth: false,
method: "GET",
// desc: '获取拉流地址',
}
},
/** 视频 ↓ **/
video: {
index: {
url: "video/index",
auth: false,
method: "GET",
// desc: '视频列表',
},
detail: {
url: "video/detail",
auth: false,
method: "GET",
// desc: '视频详情',
},
playNum: {
url: "video/playNum",
auth: false,
method: "GET",
// desc: '视频播放量统计',
}
},
/** 分类 ↓ **/
category: {

查看文件

@@ -282,10 +282,10 @@ export function applyThemeToTabbar(tabbarData) {
const LEGACY_HEADER_COLORS = ['#FFA33E', '#ff1926', '#FF0e25', '#ff0e25', '#EFC480', '#001F54', '#003399', '#002366', '#0066CC', '#0055AA'];
const BRAND_NAME = '雄戈小酒';
const BRAND_NAME = '橙虎小酒';
const LEGACY_BRAND_REPLACEMENTS = [
[/雄哥小酒/g, '雄戈小酒'],
[/雄哥小酒/g, '橙虎小酒'],
[/雄哥系列/g, '雄戈系列'],
[/贵州雄哥酒业有限公司/g, '贵州雄戈酒业有限公司'],
[/雄哥酒业/g, '雄戈酒业'],

查看文件

@@ -0,0 +1,59 @@
/**
* 微信小程序隐私协议:仅在调用相册/相机前按需触发
*/
let handlerRegistered = false;
let showPrivacyCallback = null;
export function setPrivacyModalHandler(callback) {
showPrivacyCallback = callback || null;
}
export function initPrivacyAuthorization() {
// #ifdef MP-WEIXIN
if (handlerRegistered || typeof wx === 'undefined' || !wx.onNeedPrivacyAuthorization) {
return;
}
handlerRegistered = true;
wx.onNeedPrivacyAuthorization((resolve) => {
if (typeof showPrivacyCallback === 'function') {
showPrivacyCallback(resolve);
return;
}
// 未注册自定义弹窗时,交给微信官方弹窗处理
});
// #endif
}
export function getPrivacySettingInfo() {
return new Promise((resolve) => {
// #ifdef MP-WEIXIN
if (typeof wx === 'undefined' || !wx.getPrivacySetting) {
resolve({ needAuthorization: false, privacyContractName: '' });
return;
}
wx.getPrivacySetting({
success(res) {
resolve({
needAuthorization: !!res.needAuthorization,
privacyContractName: res.privacyContractName || ''
});
},
fail() {
resolve({ needAuthorization: false, privacyContractName: '' });
}
});
// #endif
// #ifndef MP-WEIXIN
resolve({ needAuthorization: false, privacyContractName: '' });
// #endif
});
}
export function openPrivacyContract() {
// #ifdef MP-WEIXIN
if (typeof wx !== 'undefined' && wx.openPrivacyContract) {
wx.openPrivacyContract();
}
// #endif
}

查看文件

@@ -1,4 +1,4 @@
"""Generate tab bar icons for 雄戈小酒 mini-program."""
"""Generate tab bar icons for 橙虎小酒 mini-program."""
from PIL import Image, ImageDraw
SIZE = 162 # 2x for retina (display as 81px)

查看文件

@@ -1,4 +1,4 @@
// 雄戈小酒 - 商务蓝白主题(深蓝 Logo + 商务蓝交互)
// 橙虎小酒 - 商务蓝白主题(深蓝 Logo + 商务蓝交互)
$brand-navy: #0A2463;
$brand-navy-light: #1E3A8A;
$brand-primary: #1677FF;