admin1/jiangchengfeiyi-xiaochengxu
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this is lastest update

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-25 15:45:26 +08:00
parent 04864e6ed1
commit bc3edf2837
8 changed files with 65 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pages/Shopping-cart/productmain/testproductmain.vue
View File

@ -3,9 +3,10 @@
<view class="flex-row items-center section_2"> <view class="flex-row items-center section_2">
<text class="font text">购物车</text> <text class="font text">购物车</text>
<view class="flex-row items-center flex-1 section_3 ml-17"> <view class="flex-row items-center flex-1 section_3 ml-17">
<image class="shrink-0 image" <image class="shrink-0 image" mode="aspectFit"
:src="shoppingCartUrl + '/productmain/search.png'" /> :src="shoppingCartUrl + '/productmain/search.png'" />
<input confirm-type="search" @confirm="gotoSearch" v-model="searchText" class="section_1 ml-4" placeholder="搜索购物车商品" /> <input :focus="isShowInput" @blur="blur" v-show="isShowInput" confirm-type="search" @confirm="gotoSearch" v-model="searchText" class="section_1 ml-4" placeholder="搜索购物车商品" />
<view v-show="!isShowInput" @click="changeInput" class="section_1 ml-4"><text style="color: #B1B1B1;">搜索购物车商品</text></view>
</view> </view>
<text class="font text_2 ml-17" @click="changeState">{{ stateText.topBtn }}</text> <text class="font text_2 ml-17" @click="changeState">{{ stateText.topBtn }}</text>
</view> </view>
@ -47,8 +48,8 @@
</view> </view>
</view> </view>
<view class="flex-row shrink-0 group_4"> <view class="flex-row shrink-0 group_4">
<view class="flex-col justify-start items-center text-wrapper"><text <view class="flex-col justify-start items-center text-wrapper">
class="font_6">{{ item.quantity }}</text></view> <text class="font_6">{{ item.quantity }}</text></view>
<!-- 添加数量 --> <!-- 添加数量 -->
<image class="image_5 ml-2" <image class="image_5 ml-2"
:src="shoppingCartUrl + '/productmain/add.png'" :src="shoppingCartUrl + '/productmain/add.png'"
@ -129,7 +130,10 @@
import * as math from 'mathjs' import * as math from 'mathjs'
import { shoppingCartUrl,bkgPubilcPath } from '../../../common/globalImagesUrl'; import { shoppingCartUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl'; import { publicPath } from '../../../common/globalImagesUrl';
import { JudgeIsNullity } from '../../../common/globalFunction';
const products = ref([]) const products = ref([])
const tempProducts = ref([])
const isShowInput = ref(false)
const current = ref(1) //用于判断是实体类商品还是服务类商品 const current = ref(1) //用于判断是实体类商品还是服务类商品
const allCheck = ref(false) //全选 const allCheck = ref(false) //全选
const checkedData = ref([]) //选择的暂存保存数组 const checkedData = ref([]) //选择的暂存保存数组
@ -160,6 +164,20 @@
},1000) },1000)
}) })
// const focus = () => {
// isShowInput.value = true
// }
const blur = () => {
if (JudgeIsNullity(searchText.value)) {
isShowInput.value = !isShowInput.value
}
}
const changeInput = () => {
isShowInput.value = !isShowInput.value
}
//获取实体类商品信息 //获取实体类商品信息
const getEntityPro = async () => { const getEntityPro = async () => {
@ -173,6 +191,7 @@
console.log('res--->', res.data); console.log('res--->', res.data);
if (res.data.code === 1) { if (res.data.code === 1) {
products.value = res.data.data products.value = res.data.data
tempProducts.value = res.data.data
products.value.forEach((item) => { products.value.forEach((item) => {
item.checked = false //所有都先未选中 item.checked = false //所有都先未选中
}) })
@ -238,6 +257,7 @@
console.log('服务类商品--->', res); console.log('服务类商品--->', res);
if (res.data.code === 1) { if (res.data.code === 1) {
products.value = res.data.data products.value = res.data.data
tempProducts.value = res.data.data
products.value.forEach((item)=>{ //添加多选框状态 products.value.forEach((item)=>{ //添加多选框状态
item.checked = false item.checked = false
}) })
@ -616,13 +636,13 @@
const gotoSearch = async () => { const gotoSearch = async () => {
if (searchText.value === '') { if (searchText.value === '') {
await getProductCart() products.value = tempProducts.value
return ; return ;
} }
if (current.value === 1) { if (current.value === 1) {
products.value = products.value.filter(item => item.cartGoodVO.name.includes(searchText.value)) products.value = tempProducts.value.filter(item => item.cartGoodVO.name.includes(searchText.value))
} else { } else {
products.value = products.value.filter(item => item.cartExperienceGoodVO.name.includes(searchText.value)) products.value = tempProducts.value.filter(item => item.cartExperienceGoodVO.name.includes(searchText.value))
} }
} }
@ -691,13 +711,13 @@
.section_3 { .section_3 {
padding: 0 15rpx; padding: 0 15rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 9.38rpx; border-radius: 20.38rpx;
height: 56.25rpx; height: 56.25rpx;
} }
.image { .image {
width: 54.38rpx; width: 45.63rpx;
height: 52.5rpx; height: 45rpx;
} }
.section_1 { .section_1 {
@ -848,7 +868,7 @@
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 18.73rpx; line-height: 26.25rpx;
color: #323232; color: #323232;
} }
@ -987,7 +1007,7 @@
} }
.text_12 { .text_12 {
color: #000000; color: #323232;
} }
.text-wrapper_3 { .text-wrapper_3 {

2
pages/book/myPhotoProducts/myPhotoProducts.vue
View File

@ -227,7 +227,7 @@
line-height: 32.44rpx; line-height: 32.44rpx;
} }
.divider { .divider {
background-color: #818181; background-color: #BEBEBE;
height: 1.88rpx; height: 1.88rpx;
} }
.pos { .pos {

24
pages/mine/main/main.vue
View File

@ -19,30 +19,30 @@
<text class="mt-18 font text_2">剩余积分：{{ myPoints }}</text> <text class="mt-18 font text_2">剩余积分：{{ myPoints }}</text>
</view> </view>
</view> </view>
<view class="flex-row equal-division"> <view class="flex-row equal-division" style="z-index: 99;">
<view class="flex-col items-center" @click="goto(0)"> <view class="flex-col items-center" @click="gotoOrderListPage(0)">
<image class="shrink-0 image_2" :src="mineUrl + '/main/all.png'" /> <image class="shrink-0 image_2" :src="mineUrl + '/main/all.png'" />
<text class="font text_3">全部</text> <text class="font text_3">全部</text>
</view> </view>
<view class="flex-col items-center ml-1" @click="goto(1)"> <view class="flex-col items-center ml-1" @click="gotoOrderListPage(1)">
<image class="shrink-0 image_2" :src="mineUrl + '/main/dzf.png'" /> <image class="shrink-0 image_2" :src="mineUrl + '/main/dzf.png'" />
<text class="font text_5">待支付</text> <text class="font text_5">待支付</text>
</view> </view>
<view class="flex-col items-center ml-1" @click="goto(2)"> <view class="flex-col items-center ml-1" @click="gotoOrderListPage(2)">
<image class="shrink-0 image_2" :src="mineUrl + '/main/dfh.png'" /> <image class="shrink-0 image_2" :src="mineUrl + '/main/dfh.png'" />
<text class="font text_4">待发货</text> <text class="font text_4">待发货</text>
</view> </view>
<view class="flex-col items-center ml-1" @click="goto(3)"> <view class="flex-col items-center ml-1" @click="gotoOrderListPage(3)">
<image class="shrink-0 image_2" :src="mineUrl + '/main/dsh.png'" /> <image class="shrink-0 image_2" :src="mineUrl + '/main/dsh.png'" />
<text class="font text_6">待收货</text> <text class="font text_6">待收货</text>
</view> </view>
<view class="flex-col items-center ml-1" @click="goto(4)"> <view class="flex-col items-center ml-1" @click="gotoOrderListPage(4)">
<image class="shrink-0 image_2" :src="mineUrl + '/main/ytk.png'" /> <image class="shrink-0 image_2" :src="mineUrl + '/main/ytk.png'" />
<text class="font text_7">已退款</text> <text class="font text_7">已退款</text>
</view> </view>
</view> </view>
</view> </view>
<view class="flex-col mt-20" v-if="nickName != '未登录'"> <view class="flex-col mt-20" v-if="nickName != '未登录'" style="z-index: 99;">
<view class="flex-col group_3"> <view class="flex-col group_3">
<view class="flex-row justify-between relative" @click="jump_addressList"> <view class="flex-row justify-between relative" @click="jump_addressList">
<image class="image_3" :src="mineUrl + '/main/address.png'" /> <image class="image_3" :src="mineUrl + '/main/address.png'" />
@ -161,7 +161,7 @@
url: '/pages/mine/bookings/booking' url: '/pages/mine/bookings/booking'
}) })
} }
const goto = (tab) => { const gotoOrderListPage = (tab) => {
uni.navigateTo({ uni.navigateTo({
url: '/pages/my-order/myOrderList/myOrderList?status=' + tab url: '/pages/my-order/myOrderList/myOrderList?status=' + tab
}) })
@ -398,7 +398,7 @@
} }
.text { .text {
color: #000000; color: #323232;
font-size: 40rpx; font-size: 40rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 40.61rpx; line-height: 40.61rpx;
@ -408,7 +408,7 @@
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 27.02rpx; line-height: 27.02rpx;
color: #000000; color: #323232;
} }
.text_2 { .text_2 {
@ -474,7 +474,7 @@
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 36.47rpx; line-height: 36.47rpx;
color: #000000; color: #323232;
} }
.text_8 { .text_8 {
@ -584,7 +584,7 @@
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 30.47rpx; line-height: 30.47rpx;
color: #000000; color: #323232;
} }
.text_10 { .text_10 {

1
pages/my-order/myOrderList/myOrderList.vue
View File

@ -250,7 +250,6 @@
cookie cookie
} }
}) })
console.log(res.data.data)
orderList.value = res.data.data orderList.value = res.data.data
tempOrderList.value = res.data.data tempOrderList.value = res.data.data
dealTimeout() dealTimeout()

16
pages/my-order/researchOrder/researchOrder.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
<!-- <view class="section"></view> -->
<view class="flex-col justify-start section_2 pos"> <view class="flex-col justify-start section_2 pos">
<view class="flex-row section_3" style="display: flex; align-items: center;"> <view class="flex-row section_3" style="display: flex; align-items: center;">
<image <image
@ -16,8 +15,9 @@
<script setup> <script setup>
import {ref} from 'vue' import {ref} from 'vue'
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont';
import { myOrderUrl,bkgPubilcPath } from '../../../common/globalImagesUrl'; import { myOrderUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
import { getFonts } from '../../../common/globalFont';
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
@ -42,24 +42,16 @@
margin-left: 13.13rpx; margin-left: 13.13rpx;
} }
.page { .page {
background-color: #ffffff;
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
height: 100%; height: 100vh;
} }
// .section {
// background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=98c27c9593262699d4de87045e9a792c.png');
// background-size: 100% 100%;
// background-repeat: no-repeat;
// width: 750rpx;
// height: 1571.25rpx;
// }
.section_2 { .section_2 {
padding: 33.75rpx 0 35.63rpx; padding: 33.75rpx 0 35.63rpx;
background-color: #ffffff; background-color: #fff;
box-shadow: 0rpx 3.75rpx 3.75rpx #00000040; box-shadow: 0rpx 3.75rpx 3.75rpx #00000040;
} }
.pos { .pos {

4
pages/store-home/main/testMain.vue
View File

@ -5,7 +5,7 @@
<view class="flex-row items-center section_3" @click="goToSearch"> <view class="flex-row items-center section_3" @click="goToSearch">
<image <image
mode="aspectFit" mode="aspectFit"
class="image" class="image"
:src="workshopUrl + '/searchGood/search.png'" :src="workshopUrl + '/searchGood/search.png'"
/> />
<text class="text-wrapper font" style="color: #B1B1B1;">搜索商品</text> <text class="text-wrapper font" style="color: #B1B1B1;">搜索商品</text>
@ -324,7 +324,7 @@ input {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 24.41rpx; line-height: 24.41rpx;
color: #000000; color: #323232;
} }
.text_4 { .text_4 {
font-size: 12px; font-size: 12px;

23
pages/workshop/index/index.vue
View File

@ -7,7 +7,8 @@
class="image" mode="aspectFill" class="image" mode="aspectFill"
:src="workshopUrl + '/index/search.png'" :src="workshopUrl + '/index/search.png'"
/> />
<input class="text-wrapper ml-7" placeholder="搜索课程" placeholder-class="placeholderStyle" disabled /> <!-- <input class="text-wrapper ml-7" placeholder="搜索课程" placeholder-class="placeholderStyle" disabled /> -->
<view class="text-wrapper ml-7"><text style="color: #B1B1B1;">搜索商品</text></view>
</view> </view>
</view> </view>
@ -27,14 +28,15 @@
class="image_1" mode="aspectFill" class="image_1" mode="aspectFill"
:src="publicPath + item.goodImg" :src="publicPath + item.goodImg"
/> />
<text class="font text_2 mt-1">{{ item.name }}</text> <text class="font text_2">{{ item.name }}</text>
<!-- <text class="font_3 text_4 mt-5">{{ item.intro.length > 19 ? item.intro.substr(0, 20) + '...' : item.intro }}</text> -->
</view> </view>
<view class="flex-row items-center group_2 mt-17"> <view class="flex-row items-center group_2 mt-17">
<image <!-- <image
class="image_4" class="image_4"
:src="workshopUrl + '/index/money.png'" :src="workshopUrl + '/index/money.png'"
/> /> -->
<text class="font_2">{{ item.price }}</text> <text class="font_2">￥{{ item.price }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -163,7 +165,7 @@ const jump_detail =(item,index)=>{
.section_3 { .section_3 {
padding: 0 15rpx; padding: 0 15rpx;
background-color: #fff; background-color: #fff;
border-radius: 18.75rpx; border-radius: 20.75rpx;
width: 506.25rpx; width: 506.25rpx;
height: 60rpx; height: 60rpx;
} }
@ -174,7 +176,7 @@ const jump_detail =(item,index)=>{
.font { .font {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
color: #000000; color: #323232;
} }
.text { .text {
line-height: 23.04rpx; line-height: 23.04rpx;
@ -218,12 +220,12 @@ const jump_detail =(item,index)=>{
height: 324.38rpx; height: 324.38rpx;
} }
.text_2 { .text_2 {
margin-left: 15.56rpx; font-size: 30rpx;
margin-right: 3.19rpx; margin: 15rpx 20rpx 0;
line-height: 30rpx; line-height: 30rpx;
} }
.group_2 { .group_2 {
padding: 0 24.3rpx; padding: 0 20rpx;
} }
.image_4 { .image_4 {
width: 26.25rpx; width: 26.25rpx;
@ -232,7 +234,6 @@ const jump_detail =(item,index)=>{
.font_2 { .font_2 {
color: #c35c5d; color: #c35c5d;
font-size: 30rpx; font-size: 30rpx;
font-family: Times New Roman;
line-height: 20.68rpx; line-height: 20.68rpx;
} }
.flexbox { .flexbox {

3
pages/workshop/searchResult/searchResult.vue
View File

@ -16,7 +16,7 @@
<view class="flex-col items-start self-stretch"> <view class="flex-col items-start self-stretch">
<image <image
class="image_2" class="image_2"
:src="item.goodImg.split(';')[0]" :src="publicPath + item.goodImg.split(';')[0]"
/> />
<text class="font_2 text_3 mt-5">{{ item.name }}</text> <text class="font_2 text_3 mt-5">{{ item.name }}</text>
<text class="font_3 text_4 mt-5">{{ item.intro.length > 19 ? item.intro.substr(0, 20) + '...' : item.intro }}</text> <text class="font_3 text_4 mt-5">{{ item.intro.length > 19 ? item.intro.substr(0, 20) + '...' : item.intro }}</text>
@ -33,6 +33,7 @@
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { workshopUrl,bkgPubilcPath } from '../../../common/globalImagesUrl'; import { workshopUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { publicPath } from '../../../common/globalImagesUrl';
const cookie = wx.getStorageSync("cookie") const cookie = wx.getStorageSync("cookie")
const keyword = ref('') const keyword = ref('')
const type = ref(0) const type = ref(0)