sx
/
jiuyiUniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并代码

This commit is contained in:
sx 2025-01-16 20:18:22 +08:00
parent 98d307ebd7
commit 53bc5bb6df
13 changed files with 290 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jiuyi2/api/shop.js
View File

@ -195,7 +195,7 @@ const shop = {
* 查看收藏记录
* @param {Object} param
*/
addProductCollect(param) {
collect(param) {
return util.request({
url: `/shopify/collect`,
method: 'GET',
@ -253,6 +253,19 @@ const shop = {
load: true,
})
},
/**
* 获取发布的商品列表
* @param {Object} param
*/
getProductionListByUserId(param) {
return util.request({
url: `/shopify/appProductionApi/getProductionListByUserId`,
data: param.data,
method: 'GET',
load: true,
})
},
}
export default shop

4
jiuyi2/common/js/config.js
View File

@ -6,8 +6,8 @@ const config = {
// #endif
// #ifndef H5
// host: 'http://1641c8e0.r22.cpolar.top',
// host: 'http://192.168.0.189:8080',
host: 'http://192.168.0.102:8080',
host: 'http://192.168.0.189:8080',
// host: 'http://192.168.0.102:8080',
// #endif
// 上传文件二级路径
uploadFilePath: "/homecommon/file/preview?fileName=",

43
jiuyi2/components/index/indexVideo.vue
View File

@ -92,6 +92,8 @@
const isLong = ref(false)
// 收藏按钮判定
const collectBtnActive = ref(false)
// 是否显示广告
const showAd = ref(false)
// 设置时间
const alarmTime = computed(() => {
let result = uni.$store.state.alarmTime
@ -415,6 +417,10 @@
// 播放变化
function handleTimeupdate(ev) {
videoTime.value = ev.detail
// 如果有商品id 并且 当前播放时间大于商家设定的广告弹出时间
if (props.item.productId && (videoTime.value.currentTime > props.item.popupTime)) {
showAd.value = true
}
// console.log('videoTime.value', videoTime.value)
}
@ -591,18 +597,18 @@
<!-- 底部用户信息 -->
<view class="panelBottom pa l0 r0 b0 pl40 pb30">
<!-- 商品信息 -->
<view class="goods df fdr mb20 br10" v-if="0">
<view class="goods df fdr mb20 br10" :class="{'active': showAd}" v-if="showAd">
<!-- 商品图片 -->
<image class="image wh100 mr15 br10" src="/static/openPage.png" mode="aspectFill" />
<image class="image wh100 mr15 br10" :src="item.productImage" mode="aspectFill" />
<view class="df fdc jcsb f1">
<view class="">
<text class="cfff f28">果农大王霹雳美味榴莲果子</text>
<view class="name">
<text class="text cfff f28">{{item.productName}}</text>
</view>
<view class="info df fdr aic mr10">
<text class="price mr10 cfff f28 b">超低价￥6.66</text>
<text class="cfff f1 f20">已售666＋单</text>
<uni-icons type="close" color="#fff" />
<text class="price mr10 cfff f28 b">￥{{item.productPrice}}</text>
<text class="cfff f1 f20">已售{{item.sales}}单</text>
<!-- <uni-icons type="close" color="#fff" /> -->
</view>
</view>
</view>
@ -716,16 +722,35 @@
.panelBottom {
padding-right: 150rpx;
//
// 图片
.image {
width: 100rpx;
height: 100rpx;
}
// 产品
.goods {
padding: 10rpx;
width: 480rpx;
margin-bottom: 20rpx;
background-color: rgba(0, 0, 0, .3);
opacity: 0;
transition-duration: .5s;
//
&.active {
opacity: 1;
}
}
// 产品图片
.name .text {
lines: 2;
text-overflow: ellipsis;
}
}
//
// 视频播放进度条
.videoProgress {
position: absolute;
left: 0;

12
jiuyi2/components/shop/detail/detail.vue Normal file
View File

@ -0,0 +1,12 @@
<script setup>
/**
* 商品详情
*/
</script>
<template>
</template>
<style>
</style>

26
jiuyi2/pages.json
View File

@ -38,27 +38,6 @@
"navigationBarBackgroundColor": "#fff"
}
},
{
"path": "pages/merchant/order/index",
"style": {
"navigationBarTitleText": "商家订单",
"onReachBottomDistance": 100,
"navigationStyle": "custom"
}
},
{
"path": "pages/merchant/commodity-release/index",
"style": {
"navigationBarTitleText": "发布商品"
}
},
{
"path": "pages/merchant/specifications/index",
"style": {
"navigationBarTitleText": "规格",
"navigationStyle": "custom"
}
},
{
"path": "pages/shop/commodity/index",
"style": {
@ -81,7 +60,8 @@
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
}, {
},
{
"path": "pages/shop/order/index",
"style": {
"navigationBarTitleText": "订单",
@ -822,7 +802,7 @@
"current": 0,
"list": [{
"name": "test",
"path": "pages/index/wallet/wallet"
"path": "pages/index/index"
}]
},

19
jiuyi2/pages/index/index.nvue
View File

@ -125,23 +125,15 @@
// 底部菜单高度
const footerMenuHeight = ref(0)
// 当前任务
const task = computed(() => {
return uni.$store.state.task
})
const task = computed(() => uni.$store.state.task)
// 用户信息
const userinfo = computed(() => uni.$store.state.userinfo || {})
// 当前tab选中
const tabCurrent = computed(() => {
return tab[tabIndex.value]
})
const tabCurrent = computed(() => tab[tabIndex.value])
// 当前视频元素对象
const currentVideoRef = computed(() => {
return proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]]
})
const currentVideoRef = computed(() => proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]])
// 系统配置
const config = computed(() => {
return uni.$store.state.config
})
const config = computed(() => uni.$store.state.config)
// 加载完成之后
onLoad(() => {
@ -269,7 +261,6 @@
// 获取更多推荐视频
function getMoreRecList() {
console.log('recList', recList)
if (recList.total <= recList.data.length) return
recList.pageNum++
getRecList()
@ -284,7 +275,7 @@
pageSize: recList.pageSize,
}
}).then(rs => {
// console.log('getRecList then rs', rs)
console.log('getRecList then rs', rs)
// 设置列表
setList(rs, recList)
}).catch(rs => {

2
jiuyi2/pages/index/wallet/topUp.vue
View File

@ -56,7 +56,7 @@
if (rs.code == 200) {
uni.requestPayment({
provider: 'alipay',
orderInfo: rs.data,
orderInfo: rs.msg,
success: rs => {
console.log('requestPayment', rs)
util.getPurse()

2
jiuyi2/pages/mine/mine.vue
View File

@ -175,7 +175,7 @@
<image src="/static/mine-ruzhushangjia.png" mode="aspectFit" class="wh50" />
<text class="txt mt10 wsn">店铺管理</text>
</view>
<view class="item ver" @click="link('/pages/merchant/business-operator/index')">
<view class="item ver" @click="link('/pages/shop/store/commodities')">
<image src="/static/mien-dianpuguanli.png" mode="aspectFit" class="wh50" />
<text class="txt mt10 wsn">商品管理</text>
</view>

2
jiuyi2/pages/mine/setting/setting.vue
View File

@ -118,7 +118,7 @@
<view class="area">
<view class="line rows" @click="loginLink('/pages/mine/userinfo')">
<view class="avatar">
<image class="head-portrait wh80" :src="userinfo.userPortrait" mode="aspectFill" />
<image class="head-portrait wh80" :src="userinfo.avatar" mode="aspectFill" />
</view>
<view class="info f1 ml20">
<view class="">{{userinfo.userNickname}}</view>

1
jiuyi2/pages/mine/userinfo.vue
View File

@ -54,6 +54,7 @@
user.personalSignature = userinfo.personalSignature
user.id = userinfo.id + ''
user.birthday = userinfo.birthday
user.avatar = userinfo.avatar
// 修改性别下标
genderIndex.value = gender.findIndex(item => item.id == userinfo.sex)
}

153
jiuyi2/pages/release/video.vue
View File

@ -6,11 +6,15 @@
import {
reactive,
getCurrentInstance,
ref
ref,
computed,
} from 'vue';
import {
onLoad,
} from '@dcloudio/uni-app'
import {
useStore
} from 'vuex'
// 工具库
import util from '@/common/js/util';
// api
@ -19,6 +23,7 @@
const {
proxy
} = getCurrentInstance()
const store = useStore()
class Form {
videoId = ''
@ -62,6 +67,14 @@
const userSelect = reactive([])
// 用户关键字
const userKeyword = ref('')
// 产品列表
const product = reactive({
pageNum: 1,
pageSize: 10,
list: [],
})
// 用户信息
const userinfo = computed(() => store.state.userinfo)
//
onLoad((option) => {
@ -104,6 +117,9 @@
// 获取标签
getLabel()
}
// 获取我发布的产品
getProductList()
})
// 获取视频详情
@ -176,7 +192,7 @@
data: {
pageNum: label.pageNum,
pageSize: label.pageSize,
name: labelKeyword.value,
tagName: labelKeyword.value,
}
}).then(rs => {
if (rs.code == 200) {
@ -213,7 +229,7 @@
function addLabel() {
api.video.setLabel({
data: {
name: labelKeyword.value,
tagName: labelKeyword.value,
}
}).then(rs => {
if (rs.code == 200) {
@ -238,7 +254,7 @@
*/
function handleSelectLabel(ev, index) {
// 是否包含
const findIndex = labelSelect.findIndex(item => item.id == ev.id)
const findIndex = labelSelect.findIndex(item => item.tagId == ev.tagId)
//
if (findIndex < 0) {
if (labelSelect.length >= 5) util.alert('最多上传5个')
@ -313,12 +329,6 @@
const data = {
...form
}
// let fnName = 'saveVideo'
// // 如果是编辑
// if (form.videoId) {
// fnName = 'updateVideo'
// }
//视频状态 0草稿 1待审核 2审核失败 3已发布 4已下架
data.status = status ? status : 0
@ -351,7 +361,7 @@
}
// 如果有选择的标签
if (labelSelect[0]) {
data.tags = labelSelect.map(item => item.id).join(',')
data.tags = labelSelect.map(item => item.tagId).join(',')
}
// if (userSelect[0]) {
// data.subscriberId = userSelect.map(item => item.userId).join(',')
@ -378,6 +388,48 @@
})
})
}
// 获取更多商品
function getMoreProductList() {
if (product.list.length >= product.total) return
product.pageNum++
getProductList()
}
// 获取已发布的商品列表
function getProductList() {
api.shop.getProductionListByUserId({
data: {
pageNum: product.pageNum,
pageSize: product.pageSize,
}
}).then(rs => {
if (rs.code == 200) {
if (product.pageNum == 1) product.list.length = 0
product.list.push(...rs.rows)
product.total = rs.total
return
}
util.alert({
content: rs.msg,
showCancel: false,
})
})
}
/**
* 选择商品
* @param {Object} item
*/
function handleProduct(item) {
if (form.productId == item.id) return
form.productId = item.id
form.productName = item.name
form.productPrice = item.price
form.productImage = item.sliderImage.split(',')[0]
form.commission = item.commission
proxy.$refs.productRef.close()
}
</script>
<template>
@ -421,7 +473,7 @@
<!-- 标签 -->
<view class="labels items mt20 df fww c333 f28" v-if="labelSelect[0]">
<view class="item fmid mr20 mb20 plr20 bar" v-for="(item,index) in labelSelect" :key="index">
<view class="mr10">#{{item.name}}</view>
<view class="mr10">#{{item.tagName}}</view>
<uni-icons type="closeempty" size="28rpx" @click="handleLabelSelectDel(item,index)" />
</view>
</view>
@ -456,13 +508,39 @@
</view>
</view>
<view class="product mtb20" v-if="userinfo.isShop == 1" @click="$refs.productRef.open()">
<view class="key">添加商品链接</view>
<view class="main mtb20 ptb20 tac br20" v-if="!form.productId">点击选择</view>
<view class="main df oh mtb20 plr30 br20" v-else>
<view class="df oh mtb20">
<view class="col oh df fdc jcsb f1 mr20">
<view class="name">{{form.productName}}</view>
<view class="price thd cFF9B27 f28">
<text class="price thd mr20">价格{{form.productPrice}}</text>
<text class="commission thd">佣金{{form.commission}}</text>
</view>
</view>
<view class="wh200 fs0 c999 bfff br10">
<image class="br10" :src="form.productImage" mode="aspectFill" />
</view>
</view>
</view>
</view>
<view class="second df jcr mtb20">
<view>需要在第</view>
<input type="text" v-model="form.popupTime" class="input" />
<view>秒展示</view>
</view>
<view class="fill" style="height: 150rpx;"></view>
<view class="footer rows plr30 bfff shadow">
<view class="btn bar lg disabled w180" @click="handleSubmit(0)">存草稿</view>
<view class="btn bar lg colourful f1 ml30" @click="handleSubmit(1)">发布作品</view>
</view>
</view>
<!-- 话题列表 -->
@ -475,9 +553,9 @@
<view class="selection">
<view class="option df aic" v-for="(item,index) in label.list" :key="index"
@click="handleSelectLabel(item,index)" :class="{
active: labelSelect.map(node => node.id).includes(item.id)
active: labelSelect.map(node => node.tagId).includes(item.tagId)
}">
<text class="thd f1">#{{item.name}}</text>
<text class="thd f1">#{{item.tagName}}</text>
</view>
</view>
</scroll-view>
@ -486,7 +564,7 @@
<!-- 结果 -->
<view class="reult items mt20 df fww c333 f28" v-if="labelSelect[0]">
<view class="item fmid mr20 mb20 plr20 bar" v-for="(item,index) in labelSelect" :key="index">
<view class="mr10">#{{item.name}}</view>
<view class="mr10">#{{item.tagName}}</view>
<uni-icons type="closeempty" size="28rpx" @click="handleLabelSelectDel(item,index)" />
</view>
</view>
@ -534,6 +612,27 @@
</view>
</view>
</uni-popup>
<!-- 发布的产品列表 -->
<uni-popup ref="productRef" type="bottom">
<view class="productAlt popBot bfff">
<view class="header ptb30 tac">我的商品展示</view>
<view class="listBox">
<scroll-view class="scroll" scroll-y="true" @scrolltolower="getMoreProductList">
<view class="item df aic mlr20 ptb20" v-for="(item,index) in product.list" :key="index"
@click="handleProduct(item)">
<view class="wh120">
<image class="br10" :src="item.sliderImage.split(',')[0]" mode="aspectFill" />
</view>
<view class="f1 t2hd ml20 c666 f30">
<text class="t2hd">{{item.name}}</text>
</view>
</view>
</scroll-view>
</view>
</view>
</uni-popup>
</view>
</template>
@ -600,4 +699,26 @@
background-color: #F4F4F4;
}
}
// 产品
.productAlt {
.scroll {
height: 800rpx;
.item+.item {
border-top: 2rpx solid #eee;
}
}
}
// 商家视频展示的秒数
.second {
.input {
width: 80rpx;
text-align: center;
flex: none;
border-bottom: 2rpx solid #111;
}
}
</style>

86
jiuyi2/pages/shop/store/commodities.vue
View File

@ -1,16 +1,79 @@
<script setup>
// 商品管理
import {
ref
ref,
reactive,
} from 'vue'
import {
onLoad,
onReachBottom
} from "@dcloudio/uni-app"
//
// 顶部导航
import apex from "@/components/header/apex.vue"
// api
import api from '@/api/index.js'
// 工具库
import util from '@/common/js/util.js'
// 产品列表
const product = reactive({
list: [],
pageNum: 1,
pageSize: 10,
})
onLoad(() => {
// 获取列表
getList()
})
// 获取更多商品
function refeshList() {
if (product.list.length >= product.total) return
product.pageNum++
getList()
}
// 获取更多商品
function getMoreList() {
if (product.list.length >= product.total) return
product.pageNum++
getList()
}
// 请求列表
function getList() {
//
api.shop.getProductionListByUserId({
data: {
pageSize: product.pageSize,
pageNum: product.pageNum,
}
}).then(rs => {
if (rs.code === 200) {
if (product.pageNum == 1) product.list.length = 0
product.list.push(...rs.rows)
product.total = rs.total
return
}
util.alert({
content: rs.msg,
showCancel: false,
})
})
}
/**
* 编辑
* @param {Object} item
*/
function handleEdit(item) {
uni.navigateTo({
url: util.setUrl('/pages/release/commodity',{
id: item.id
})
})
}
</script>
<template>
@ -22,27 +85,26 @@
</apex>
<view class="listBox oh">
<view class="item oh mtb20 mlr20 plr20 bfff br20" v-for="(item,index) in 10" :key="index">
<view class="item oh mtb20 mlr20 plr20 bfff br20" v-for="(item,index) in product.list" :key="index">
<!-- 商品信息 -->
<view class="product line df ptb20">
<view class="poster wh160">
<image class="wh160 br10"
src="https://img13.360buyimg.com/n1/jfs/t1/117234/35/34799/82687/6449f2b4Fd6e2eef9/a754c5e178c9e9be.jpg.avif"
<image class="wh160 br10" :src="item.sliderImage.split(',')[0]"
mode="aspectFill" />
</view>
<view class="info df fdc jcsb f1 ml20">
<view class="name t2hd c333 f28">靠枕 纯棉靠枕 车载居家 纯棉100% 卡通靠枕 人体工学</view>
<view class="name t2hd c333 f28">{{item.name}}</view>
<view class="count fs0 c999 f24">销量：0</view>
<view class="count fs0 c999 f24">销量：{{item.sales}}</view>
<view class="other df aic">
<view class="price f1 cFF9B27">
<text class="f30">价格：</text>
<text class="f20">￥</text>
<text class="f30">89</text>
<text class="f30">{{item.price}}</text>
</view>
<view class="f1 c999 f24">库存：×1</view>
<!-- <view class="f1 c999 f24">库存：×1</view> -->
</view>
</view>
</view>
@ -53,13 +115,13 @@
<view class="btn sm bar closeHollow plr30">改价</view>
<!-- 在没有进行中的订单才能删除 -->
<!-- <view class="btn sm bar closeHollow plr30">删除</view> -->
<view class="btn sm bar warmHollow plr30">编辑</view>
<view class="btn sm bar warmHollow plr30" @click="handleEdit(item)">编辑</view>
</view>
</view>
</view>
</view>
</template>
<style lang="scss">
<style lang="scss" scoped>
//
</style>

6
jiuyi2/pages/shop/store/order.vue
View File

@ -127,7 +127,8 @@
<view class="c333 f28">不想要了</view>
<view class="imgList mt10 c666 f24">
<template v-for="(item,index) in 3" :key="index">
<image class="imgs wh80 br10" src="/static/logo.png" mode="aspectFill" />
<image class="imgs wh80 br10" src="/static/logo.png"
mode="aspectFill" />
</template>
</view>
</view>
@ -153,6 +154,9 @@
</view>
<!-- <JyOrderCard v-for="(item, index) in 10" type="user_order"></JyOrderCard> -->
</view>
<!-- 填充 -->
<view class="fill" style="height: 30rpx;"></view>
</view>
</template>