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

Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu

Browse Source
This commit is contained in:
chen-xin-zhi 2025-02-20 11:52:54 +08:00
commit 22e0acfd08
6 changed files with 141 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ const getProductCart = async ()=>{
'cookie': wx.getStorageSync('cookie')
}
})
// console.log('res--->',res.data);
console.log('res--->',res.data);
if(res.data.code === 1) {
products.value = res.data.data
products.value.forEach((item)=>{

4
pages/home/home.vue
View File

@ -287,8 +287,4 @@ const showStop =()=>{
bottom: 24.28rpx;
}
@import url(../../common/css/global.css);
// @font-face {
// font-family: "ZhongShanFonts";
// src: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/ZhongShanFonts.ttf');
// }
</style>

167
pages/login/login.vue
View File

@ -1,26 +1,28 @@
<template>
<view class="all">
<view>
<view>
<!-- <img src="http://110.42.248.235:866/images/system/666/HmCyrnRc-login.png" class="img"> -->
</view>
<view class="text_all">
<view class="text_tishi">
请完成授权以继续使用
</view>
<button @click="login" class="text_btn">微信账号一键登录</button>
<!-- <view class="text_no">
请选择手机号登录?
</view> -->
<view class="flex-col items-start relative page">
<view class="section_2"></view>
<image
class="image"
src="https://ide.code.fun/api/image?token=6784b7164ae84d0012235720&name=4f57dc3a50dc99c58860b6ef6a6aafb0.png"
/>
<text class="font pos_2">泠</text>
<text class="font pos_4">珑</text>
<view class="section_3 pos_5"></view>
<view class="flex-col justify-start items-center text-wrapper pos_6" @click="login">
<text class="text">微信登陆</text>
</view>
</view>
</view>
<!-- </view> -->
</template>
<script setup>
import { ref } from 'vue'
import { baseUrl, testUrl , suiUrl} from '@/api/request';
import { onMounted } from 'vue';
onMounted(()=>{
getFonts() //获取字体
})
const login = () => {
uni.login({
provider: 'weixin', //使用微信登录
@ -63,53 +65,98 @@ const loginUser = async ( code ) =>{
return;
}
}
const getFonts =()=>{ //获取字体
uni.loadFontFace({
family: 'FangZhengXiaoZhuan',
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.ttf")`,
success:(res) =>{
console.log('success',res);
},
fail:(err) => {
console.log('err',err);
}
})
uni.loadFontFace({
family: 'FangZhengFonts',
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.TTF")`,
success:(res) =>{
console.log('success',res);
},
fail:(err) => {
console.log('err',err);
}
})
}
</script>
<style lang="scss" scoped>
.all {
display: flex;
align-items: center;
justify-content: center;
width: 750rpx;
height: 1206rpx;
.img {
display: flex;
width: 480rpx;
height: 380rpx;
margin:30rpx auto;
}
.text_all {
width: 520rpx;
height: 400rpx;
margin: 40rpx auto 0;
.text_tishi {
font-size: 28rpx;
text-align: center;
margin-bottom: 40rpx;
}
.text_btn {
width: 520rpx;
height: 90rpx;
background-color: yellow;
border-radius: 120rpx;
font-size: 32rpx;
color: #fff;
text-align: center;
line-height: 90rpx;
margin-bottom: 20rpx;
}
.text_no {
font-size: 28rpx;
text-align: center;
color: #2493F1;
}
}
}
.page {
padding-left: 118.13rpx;
background-image: url('https://ide.code.fun/api/image?token=6784b7164ae84d0012235720&name=748c723c0b3ea17eb04647d0879f9b81.png');
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
height: 100%;
}
.section_2 {
margin-left: 256.88rpx;
background-color: #9d2624;
width: 1.88rpx;
height: 388.13rpx;
}
.image {
margin-top: 136.88rpx;
opacity: 0.35;
width: 631.88rpx;
height: 907.5rpx;
}
.font {
font-size: 240rpx;
font-family: FangZhengXiaoZhuan;
line-height: 288.75rpx;
color: #9d2624;
}
.pos_2 {
position: absolute;
right: 257.56rpx;
top: 462.19rpx;
}
.pos_4 {
position: absolute;
left: 50%;
bottom: 414.38rpx;
transform: translateX(-50%);
}
.section_3 {
background-color: #9d2624;
width: 1.88rpx;
height: 418.13rpx;
}
.pos_5 {
position: absolute;
left: 50%;
top: 1014.38rpx;
transform: translateX(-50%);
}
.text-wrapper {
padding: 27.54rpx 0 28.82rpx;
background-color: #ffffff;
border-radius: 37.5rpx 0 0 37.5rpx;
width: 204rpx;
}
.pos_6 {
position: absolute;
right: 0;
top: 1348.13rpx;
}
.text {
color: #000000;
font-size: 30rpx;
font-family: FangZhengFonts;
line-height: 28.01rpx;
text-transform: capitalize;
}
@import url(../../common/css/global.css);
</style>

12
pages/order/product-waitpay/product-waitpay.vue
View File

@ -1,4 +1,3 @@
<!-- 单个商品购买页面 -->
<template>
<view class="flex-col justify-start relative page">
<view class="flex-col group_1">
@ -131,7 +130,8 @@
<view class="flex-col section_6">
<text class="self-start font_7 text_19">订单备注</text>
<view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
<text class="font_2 text_20">备注建议提前协商（250字以内）</text>
<!-- <text class="font_2 text_20">备注建议提前协商（250字以内）</text> -->
<textarea @input="textAssign" auto-height style="width: 360px;"></textarea>
</view>
</view>
</view>
@ -175,7 +175,7 @@ const labelList = ref([]) //老套路，商品标签
const userInfo = wx.getStorageSync('userInfo') //用户信息
const orderItemList = ref({})
const totalInfo = ref([]) //购物车传过来的批量商品
const note = ref('123')
const note = ref('')
const postCartArr = ref([])
onMounted(() => {
getFonts()
@ -345,6 +345,10 @@ const wxPay = async( oid )=> { //传入订单id
})
}
}
const textAssign = (e) => { //文本输入框赋值方法
note.value = e.detail.value
// console.log('note--->',note.value);
}
//获取字体
const getFonts =()=>{
uni.loadFontFace({
@ -612,7 +616,7 @@ const getFonts =()=>{
.text-wrapper_2 {
margin-left: 3.99rpx;
margin-right: 3.99rpx;
padding: 22.35rpx 0 115.22rpx;
padding: 22.35rpx 20rpx;
background-color: #ffefef;
border-radius: 9.38rpx;
}

12
pages/order/singleGoodOrder/singleGoodOrder.vue
View File

@ -131,7 +131,8 @@
<view class="flex-col section_6">
<text class="self-start font_7 text_19">订单备注</text>
<view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
<text class="font_2 text_20">备注建议提前协商（250字以内）</text>
<!-- <text class="font_2 text_20">备注建议提前协商（250字以内）</text> -->
<textarea @input="textAssign" auto-height style="width: 360px;"></textarea>
</view>
</view>
</view>
@ -175,7 +176,7 @@ const labelList = ref([]) //老套路，商品标签
const userInfo = wx.getStorageSync('userInfo') //用户信息
const orderItemList = ref({})
const totalInfo = ref([]) //购物车传过来的批量商品
const note = ref('123')
const note = ref('')
const postCartArr = ref([])
const quantity = ref(1) //商品数量
onMounted(() => {
@ -352,6 +353,11 @@ const getFonts =()=>{
}
})
}
const textAssign = (e) => { //文本输入框赋值方法
// console.log(e);
note.value = e.detail.value
console.log('note--->',note.value);
}
</script>
<style lang="scss" scoped>
@ -606,7 +612,7 @@ const getFonts =()=>{
.text-wrapper_2 {
margin-left: 3.99rpx;
margin-right: 3.99rpx;
padding: 22.35rpx 0 115.22rpx;
padding: 22.35rpx 20rpx;
background-color: #ffefef;
border-radius: 9.38rpx;
}

26
pages/workshop/component/timePopUp.vue
View File

@ -10,9 +10,9 @@
<text class="font text_2">￥</text>
<text class="text">{{ productInfo.price }}</text>
</view>
<text class="font_2 text_3">请选择</text>
<!-- <text class="font_2 text_3">请选择</text> -->
<text class="font_2 pos_2">最大人数：0</text>
<text class="font_2 pos">场次</text>
<!-- <text class="font_2 pos">场次</text> -->
</view>
</view>
<view class="flex-col group_4">
@ -44,7 +44,7 @@
<text class="self-start font_3 text_7">选择预约时间</text>
<view class="section_1">
<scroll-view scroll-x="true">
<view class="flex-row justify-between items-baseline group_1">
<view class="flex-row items-baseline group_1">
<text :style="{ color: item.color }" class="font_4 text_8" v-for="(item, index) in bookTimeList" :key="index" @click="chooseDate(index)">
{{ weekDay(item.specificDate) }}{{ item.specificDate.substring(5,10) }}
</text>
@ -112,8 +112,11 @@ const classNum = ref(1) //课程数量
const flag = ref(0)
onLoad((options)=>{
})
onMounted(()=>{
getProduct()
onMounted( async ()=>{
await getProduct()
//每次加载都先选第一个
await chooseDate(0)
await chooseTimeSlot(0)
})
const chooseDate = (index) => { //选中后要改变颜色和切换日期
selected.value.date = bookTimeList.value[index].specificDate
@ -226,7 +229,7 @@ const add =()=> { //传入当前课程最大人数
}
.group_5 {
margin-bottom: 5.29rpx;
padding-bottom: 28.86rpx;
padding-bottom: 48.86rpx;
width: 157.8rpx;
}
.group_6 {
@ -436,7 +439,7 @@ const add =()=> { //传入当前课程最大人数
line-height: 28.84rpx;
}
.section_5 {
margin-top: 54.38rpx;
margin: 54.38rpx 0 100rpx 0;
padding: 32.23rpx 10.56rpx 91.29rpx 17.57rpx;
background-color: #fff2f2f5;
border-radius: 18.75rpx;
@ -451,10 +454,13 @@ const add =()=> { //传入当前课程最大人数
margin-left: 2.12rpx;
}
.section_6 {
margin-left: 15rpx;
margin-top: 88.13rpx;
position: fixed;
left: 0;
right: 0;
bottom: 0;
// margin-left: 15rpx;
// margin-top: 88.13rpx;
padding: 16.88rpx 0;
background-color: #ffffff;
}
.section_7 {
padding: 26.14rpx 0 25.07rpx;