2025.03.12 工作代码提交

This commit is contained in:
sx 2025-03-12 22:11:26 +08:00
parent 09e8b23e43
commit 134facabb2
14 changed files with 633 additions and 605 deletions

View File

@ -110,6 +110,18 @@ const shop = {
})
},
/**
* 商品详情下面的商品推荐
* @param {Object} param
*/
getInfoProductRecommendations(param) {
return util.request({
url: `/shopify/appProductionApi/infoProductRecommendations`,
method: 'GET',
query: param.query
})
},
/**
* 商品分类列表
* @param {Object} param
@ -134,6 +146,18 @@ const shop = {
})
},
/**
* 个人中心下面的商品推荐
* @param {Object} param
*/
getMineUserProList(param) {
return util.request({
url: `/shopify/appProductionApi/personalCenterProductRecommendations`,
method: 'GET',
query: param.query,
})
},
/**
* 添加商品浏览记录
* @param {Object} param

View File

@ -9,7 +9,7 @@ const config = {
host: 'http://91f.xyz:8080',
// #endif
// 是否vivo显示
showVivo: false,
showVivo: true,
// 支付方式配置
payType: {
score: {

View File

@ -126,6 +126,9 @@
<view class="main">
<!-- 获取详情 -->
<proDetail :id="proId" :detail="detail" />
<!-- 填充 -->
<view class="fill" style="height: 180rpx;"></view>
</view>
</scroll-view>

View File

@ -49,23 +49,6 @@
})
//
const recentOrderList = ref([])
//
const menuFn = {
//
store() {
link('/pages/shop/store/index')
},
//
customerService() {
link('/pages/news/question-answer/index')
},
//
heibianStar() {
//
}
}
//
const editorCtx = ref(null)
//
const spaceIndex = ref(0)
//
@ -94,7 +77,6 @@
let result = ''
const richText = props.detail.infoRichText || ''
if (richText) result = decodeURIComponent(escape(atob(richText)))
console.log('richText', result, decodeURIComponent(escape(atob(richText))))
return result
})
@ -378,12 +360,9 @@
<!-- 商品详情 -->
<view class="content mt30">
<!-- <rich-text :nodes="infoRichText" v-if="infoRichText" /> -->
<parseRichText :imageProp="{'mode': 'widthFix',}" :content="infoRichText" />
<parseRichText :imageProp="{'mode': 'widthFix',}" :content="infoRichText" v-if="infoRichText" />
</view>
</view>
<!-- 填充 -->
<view class="fill" style="height: 180rpx;"></view>
</template>
<style lang="scss">

View File

@ -1,42 +1,42 @@
<script setup>
//
import {
//
import {
ref,
reactive,
getCurrentInstance,
computed,
defineEmits,
onMounted
} from 'vue'
//
import util from '@/common/js/util.js'
//
import api from '@/api/index.js'
//
import {
} from 'vue'
//
import util from '@/common/js/util.js'
//
import api from '@/api/index.js'
//
import {
useStore
} from 'vuex'
} from 'vuex'
const {
const {
proxy
} = getCurrentInstance()
//
const store = useStore()
//
const props = defineProps({
} = getCurrentInstance()
//
const store = useStore()
//
const props = defineProps({
//
detail: {
type: Object,
default: () => ({})
},
})
//
const emit = defineEmits(['update', 'buy'])
//
const userinfo = computed(() => store.state.userinfo)
})
//
const emit = defineEmits(['update', 'buy'])
//
const userinfo = computed(() => store.state.userinfo)
//
function handleCollect() {
//
function handleCollect() {
util.isLogin().then(rs => {
//
api.shop.addProductCollect({
@ -45,7 +45,7 @@ function handleCollect() {
type: {
0: 1,
1: 0,
}[props.detail.isCollect]
} [props.detail.isCollect]
}
}).then(rs => {
if (rs.code == 200) {
@ -53,7 +53,7 @@ function handleCollect() {
props.detail.isCollect = {
0: 1,
1: 0,
}[props.detail.isCollect]
} [props.detail.isCollect]
//
props.detail.collectNumber = rs.data
return
@ -69,26 +69,26 @@ function handleCollect() {
url: '/pages/login/loginPhone'
})
})
}
}
/**
/**
* 跳转
* @param {Object} url 跳转路径
*/
function link(url) {
function link(url) {
uni.navigateTo({
url,
})
}
}
//
function handleBuy() {
//
function handleBuy() {
emit('buy')
}
}
//
function toCustomer() {
//
function toCustomer() {
// api.shop.getCustomerService({ merchantId: props.detail.merId }).then(rs => {
// if (rs.code == 200) {
// let param = {};
@ -107,7 +107,7 @@ function toCustomer() {
// }
// })
}
}
</script>
<template>
@ -144,8 +144,8 @@ function toCustomer() {
</template>
<style scoped lang="scss">
//
.footerMneu {
//
.footerMneu {
//
.option {
@ -156,5 +156,5 @@ function toCustomer() {
font-size: 24rpx;
}
}
}
}
</style>

View File

@ -16,24 +16,23 @@
choicenessTitle: {
type: Boolean,
default: false,
},
requestFn: {
type: Function,
default: (ev) => {
return api.shop.getProduct(ev)
}
},
})
//
//
const listPrototype = reactive({
pageSize: 10,
pageNum: 1,
total: 0,
//
searchValue: '',
//
merId: '',
//
brandId: '',
// code
categoryCode: '',
data: [],
})
//
const list = reactive([])
/**
* 点击列表项
@ -43,7 +42,8 @@
//
uni.navigateTo({
url: util.setUrl('/pages/shop/commodity/index', {
productId: item.id
productId: item.id,
categoryId: item.categoryId,
})
})
}
@ -64,24 +64,18 @@
//
function getList() {
api.shop.getProduct({
//
console.log('listPrototype', listPrototype)
props.requestFn({
data: {
pageSize: listPrototype.pageSize,
pageNum: listPrototype.pageNum,
//
searchValue: listPrototype.searchValue,
//
merId: listPrototype.merId,
//
brandId: listPrototype.brandId,
// code
categoryCode: listPrototype.categoryCode,
...listPrototype,
},
query: {
...listPrototype,
},
}).then(rs => {
if (rs.code == 200) {
if (listPrototype.pageNum == 1) listPrototype.data.length = []
listPrototype.data.push(...rs.rows)
if (listPrototype.pageNum == 1) list.length = []
list.push(...rs.rows)
listPrototype.total = rs.total
return
}
@ -111,8 +105,7 @@
</view>
<view class="list">
<view class="item oh bfff br20" v-for="(item, index) in listPrototype.data" :key="index"
@click="handleItem(item)">
<view class="item oh bfff br20" v-for="(item, index) in list" :key="index" @click="handleItem(item)">
<!-- 需要展示的图 -->
<image class="poster" :src="item.sliderImage.split(',')[0]" mode="aspectFill" />

View File

@ -96,7 +96,8 @@
"path": "pages/mine/mine",
"style": {
"navigationBarTitleText": "我的",
"navigationStyle": "custom"
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
{

View File

@ -65,9 +65,7 @@
return result
})
//
const purse = computed(() => {
return store.state.purse || {}
})
const purse = computed(() => store.state.purse || {})
//
const configData = reactive({

View File

@ -1,59 +1,79 @@
<script setup>
/**
/**
* 个人中心 商城
*/
//
import {
//
import {
ref,
computed,
} from 'vue'
import {
getCurrentInstance
} from 'vue'
import {
onReachBottom,
onPullDownRefresh,
onShow,
onLoad,
onPageScroll
} from '@dcloudio/uni-app';
import {
onReady,
onPageScroll,
} from '@dcloudio/uni-app';
import {
useStore
} from 'vuex'
//
import statusBar from '@/components/header/statusBar'
//
import noLogin from '@/components/login/noLogin'
} from 'vuex'
//
import statusBar from '@/components/header/statusBar'
//
import noLogin from '@/components/login/noLogin'
//
import productList from '@/components/shop/productList/productList';
//
import footerMneu from '@/components/footerMenu/footerMenu'
//
import util from '@/common/js/util';
//
const store = useStore()
//
const userinfo = computed(() => {
let result = store.state.userinfo || {}
return result
})
//
const showHeader = ref(false)
//
import productList from '@/components/shop/productList/productList';
//
import footerMneu from '@/components/footerMenu/footerMenu'
//
import util from '@/common/js/util';
//
import api from '@/api/index.js'
onPageScroll((ev) => {
const {
proxy
} = getCurrentInstance()
//
const store = useStore()
//
const userinfo = computed(() => store.state.userinfo || {})
//
const showHeader = ref(false)
onReady(() => {
util.isLogin().then(rs => {
proxy.$refs.productListRef.getList()
})
})
onReachBottom(() => {
proxy.$refs.productListRef.getMoreList()
})
onPullDownRefresh(() => {
proxy.$refs.productListRef.refreshList()
})
onPageScroll((ev) => {
if (ev.scrollTop > 44) showHeader.value = true
else showHeader.value = false
})
})
//
function link(url) {
//
function link(url) {
uni.navigateTo({
url,
})
}
function toCustomer() {
}
function toCustomer() {
uni.navigateTo({
url: util.setUrl('/pages/mine/setting/feedback')
})
}
}
</script>
<template>
@ -211,7 +231,8 @@ function toCustomer() {
<!-- 精选 -->
<view class="recommend mtb20 mlr20">
<productList choicenessTitle="true"></productList>
<productList ref="productListRef" :choicenessTitle="true" :requestFn="api.shop.getMineUserProList">
</productList>
</view>
</view>
@ -220,8 +241,8 @@ function toCustomer() {
</template>
<style lang="scss" scoped>
//
.apex {
//
.apex {
position: fixed;
top: 0;
left: 0;
@ -234,17 +255,17 @@ function toCustomer() {
opacity: 1;
background-color: #fff;
}
}
}
//
.header {
//
.header {
.avatar {
background: #D8D8D8;
}
}
}
//
.wallet {
//
.wallet {
position: relative;
.right {
@ -255,10 +276,10 @@ function toCustomer() {
margin-right: 20rpx;
}
}
}
}
//
.container {
//
.container {
position: relative;
overflow: hidden;
margin: 20rpx 20rpx;
@ -270,5 +291,5 @@ function toCustomer() {
display: grid;
grid-template-columns: repeat(5, 1fr);
}
}
}
</style>

View File

@ -60,7 +60,8 @@
function getList() {
api.mine.getBankCards({}).then(rs => {
if (rs.code == 200) {
Object.assign(list, rs.data)
list.length = 0
list.push(...rs.data)
return
}
util.alert({

View File

@ -1,49 +1,49 @@
<script setup>
/**
/**
* 个人信息
*/
import {
import {
ref,
computed,
reactive,
} from 'vue'
import {
} from 'vue'
import {
onLoad,
} from '@dcloudio/uni-app'
import {
} from '@dcloudio/uni-app'
import {
useStore
} from 'vuex'
//
import util from '@/common/js/util';
//
import api from '@/api';
} from 'vuex'
//
import util from '@/common/js/util';
//
import api from '@/api';
// vuex
const store = useStore()
// vuex
const store = useStore()
//
const user = reactive({})
//
const user = reactive({})
//
const gender = reactive([{
//
const gender = reactive([{
id: 0,
name: '男',
},
{
},
{
id: 1,
name: '女',
}
])
//
const genderIndex = ref(0)
}
])
//
const genderIndex = ref(0)
onLoad(() => {
onLoad(() => {
//
syncInfo()
})
})
//
function syncInfo() {
//
function syncInfo() {
//
const userinfo = store.state.userinfo
user.background = userinfo.background
@ -58,33 +58,33 @@ function syncInfo() {
user.email = userinfo.email
//
genderIndex.value = gender.findIndex(item => item.id == userinfo.sex)
}
}
/**
/**
* 选择生日日期
* @param {Object} ev 默认事件
*/
function handleBirthday(ev) {
function handleBirthday(ev) {
const value = ev.detail.value
if (user.birthday === value) return
user.birthday = value
}
}
/**
/**
* 选择性别
* @param {Object} ev 默认事件
*/
function handleGender(ev) {
function handleGender(ev) {
const value = ev.detail.value
if (genderIndex.value === value) return
genderIndex.value = value
}
}
/**
/**
* 上传图片
* @param {String} key 需要修改个人信息的字段
*/
function uploadImg(key) {
function uploadImg(key) {
util.upload_image({
value: user[key],
type: 1,
@ -94,14 +94,14 @@ function uploadImg(key) {
console.log('user', user)
}
})
}
}
//
function handleSubmit() {
//
function handleSubmit() {
//
if (gender[genderIndex.value]) user.sex = gender[genderIndex.value].id
if (!IsEmail(user.email)) {
if (user.email && !IsEmail(user.email)) {
util.alert('邮箱格式不正确!')
return
}
@ -110,10 +110,6 @@ function handleSubmit() {
...user,
}
//
// if(data.avatar) data.avatar = util.replace_url(data.avatar)
// if(data.background) data.background = util.replace_url(data.background)
//
api.mine.updateUserInfo({
data,
@ -132,13 +128,13 @@ function handleSubmit() {
showCancel: false,
})
})
}
//
function IsEmail(str) {
}
//
function IsEmail(str) {
var reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
return reg.test(str);
}
}
</script>
<template>
@ -233,8 +229,8 @@ function IsEmail(str) {
</template>
<style lang="scss" scoped>
//
.bgBox {
//
.bgBox {
.content {
height: 400rpx;
}
@ -243,16 +239,16 @@ function IsEmail(str) {
.changeBg {
background-color: rgba(0, 0, 0, .3);
}
}
}
//
.avatarBox {
//
.avatarBox {
padding: 2rpx;
background-color: #fff;
}
}
//
.info {
//
.info {
margin-top: -20rpx;
}
}
</style>

View File

@ -39,13 +39,16 @@
const id = ref('')
//
const detail = reactive({})
// id
const categoryId = ref('')
//
const userinfo = computed(() => {
return store.state.userinfo
})
const userinfo = computed(() => store.state.userinfo)
onLoad(option => {
// id
if (option.productId) id.value = option.productId
// id
if (option.categoryId) categoryId.value = option.categoryId
//
getDetail()
//
@ -55,7 +58,13 @@
})
onReady(() => {
//
// id
if (categoryId.value) {
proxy.$refs.productListRef.listPrototype.categoryId = categoryId.value
proxy.$refs.productListRef.listPrototype.productId = id.value
//
proxy.$refs.productListRef.getList()
}
})
//
@ -72,7 +81,6 @@
function addListener() {
//
uni.$on('commodityDetail', (data) => {
//
if (detail.id == data.id) getDetail()
})
}
@ -186,9 +194,13 @@
<proDetail :id="id" :detail="detail" />
<!-- 精选 -->
<view class="recommend mlr20">
<productList :choicenessTitle="true" />
<productList ref="productListRef" :choicenessTitle="true"
:requestFn="api.shop.getInfoProductRecommendations" />
</view>
<!-- 填充 -->
<view class="fill" style="height: 180rpx;"></view>
<!-- 底部菜单 -->
<view class="footer plr20 shadow bfff">
<footerMenu :detail="detail" @update="handleDetail" @buy="showMakeOrder" />

View File

@ -89,7 +89,7 @@
if (cateIndex.value === index) return
cateIndex.value = index
//
proxy.$refs.product.listPrototype.categoryCode = cateList[index].categoryCode
proxy.$refs.product.listPrototype.categoryId = cateList[index].id
//
proxy.$refs.product.refreshList()
}

View File

@ -1,78 +1,78 @@
<script setup>
//
import {
//
import {
computed,
reactive,
ref,
defineExpose,
} from 'vue'
import {
} from 'vue'
import {
onLoad,
onPageScroll
} from '@dcloudio/uni-app';
} from '@dcloudio/uni-app';
//
import util from '@/common/js/util.js'
//
import apex from '@/components/header/apex.vue'
//
import productList from '@/components/shop/productList/productList'
//
import util from '@/common/js/util.js'
//
import apex from '@/components/header/apex.vue'
//
import productList from '@/components/shop/productList/productList'
import api from '@/api/index.js'
import api from '@/api/index.js'
//
const filteredList = ref([{
//
const filteredList = ref([{
label: '默认',
value: 1,
isUpDown: false,
slot: null
}, {
}, {
label: '销量',
value: 2,
isUpDown: false,
slot: null
}, {
}, {
label: '新品',
value: 3,
isUpDown: false,
slot: null
}, {
}, {
label: '价格',
value: 4,
isUpDown: true,
slot: null
}])
//
const apexBgColor = ref('#ffffff00')
// id
const storeId = ref('')
//
const detail = reactive({})
//
const listPrototype = reactive({
}])
//
const apexBgColor = ref('#ffffff00')
// id
const storeId = ref('')
//
const detail = reactive({})
//
const listPrototype = reactive({
pageSize: 10,
pageNum: 1,
total: 0,
//
merId: '',
data: [],
})
})
//
const userinfo = computed(() => uni.$store.state.userinfo || {})
onLoad((option) => {
//
const userinfo = computed(() => uni.$store.state.userinfo || {})
onLoad((option) => {
if (option.storeId) storeId.value = option.storeId
getDetail()
listPrototype.merId = storeId.value
getList()
})
})
onPageScroll((ev) => {
onPageScroll((ev) => {
apexBgColor.value = ev.scrollTop > 44 ? '#fff' : '#ffffff00'
})
})
//
function getDetail() {
//
function getDetail() {
api.shop.merchant({
query: {
merId: storeId.value,
@ -88,16 +88,16 @@ function getDetail() {
showCancel: false
});
})
}
//
function handleCollectStore() {
}
//
function handleCollectStore() {
api.shop.followShop({
data: {
shopId: storeId.value,
status: {
0: 1,
1: 0,
}[detail.isFollow]
} [detail.isFollow]
}
}).then(rs => {
if (rs.code == 200) {
@ -105,7 +105,7 @@ function handleCollectStore() {
detail.isFollow = {
0: 1,
1: 0,
}[detail.isFollow]
} [detail.isFollow]
//
detail.followNum = rs.data
@ -117,9 +117,9 @@ function handleCollectStore() {
showCancel: false,
})
})
}
//
function toCustomer() {
}
//
function toCustomer() {
uni.navigateTo({
url: util.setUrl('/pages/mine/setting/feedback')
})
@ -141,9 +141,9 @@ function toCustomer() {
// }
// })
}
//
function getList() {
}
//
function getList() {
api.shop.getProduct({
data: {
@ -166,33 +166,33 @@ function getList() {
}).finally(rs => {
uni.stopPullDownRefresh()
})
}
//
function handleItem(item) {
}
//
function handleItem(item) {
uni.navigateTo({
url: util.setUrl('/pages/shop/commodity/index', {
productId: item.id
})
})
}
//
function refreshList() {
}
//
function refreshList() {
listPrototype.pageNum = 1
listPrototype.total = 0
getList()
}
}
//
function getMoreList() {
//
function getMoreList() {
if (listPrototype.total <= listPrototype.data.length) return
listPrototype.pageNum++
getList()
}
}
defineExpose({
defineExpose({
refreshList,
getMoreList,
})
})
</script>
<template>
@ -283,8 +283,8 @@ defineExpose({
</template>
<style lang="scss" scoped>
//
.list {
//
.list {
display: grid;
grid-template-columns: repeat(2, 1fr);
grid-gap: 20rpx;
@ -297,5 +297,5 @@ defineExpose({
border-radius: 20rpx 20rpx 0 0;
}
}
}
}
</style>