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

合完了

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-17 18:10:19 +08:00
parent 5eada5a1e4
commit 4da939b708
36 changed files with 281 additions and 903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages.json
View File

@ -116,13 +116,6 @@
"navigationBarTitleText" : "" "navigationBarTitleText" : ""
} }
}, },
{
"path": "pages/Shopping-cart/productmain/productmain",
"style" :
{
"navigationBarTitleText" : ""
}
},
{ {
"path" : "pages/store-home/ProductDetails/ProductDetails", "path" : "pages/store-home/ProductDetails/ProductDetails",
"style" : "style" :

2
pages/Shopping-cart/component/addressSelected.vue
View File

@ -5,7 +5,7 @@
<view class="flex-row items-center section_2" v-if="isShow"> <view class="flex-row items-center section_2" v-if="isShow">
<image <image
class="shrink-0 image" class="shrink-0 image"
:src="shoppingCartUrl + '/component/add.png'" :src="shoppingCartUrl + '/component/dw.png'"
/> />
<view class="flex-col flex-1 group"> <view class="flex-col flex-1 group">
<view class="flex-row items-baseline group_14"> <view class="flex-row items-baseline group_14">

6
pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-col group"> <view class="flex-col group">
<view class="flex-col self-stretch section mt-15"> <view class="flex-col self-stretch section mt-15">
<view class="flex-row items-center group_2"> <view class="flex-row items-center group_2">
@ -22,7 +22,7 @@
</picker> </picker>
<image <image
class="pos tag" class="pos tag"
:src="shoppingCartUrl + '/component/dw.png'" :src="shoppingCartUrl + '/newaddress_info/dw.png'"
@click="chooseLocation()" @click="chooseLocation()"
/> />
</view> </view>
@ -56,6 +56,7 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { shoppingCartUrl } from '../../../common/globalImagesUrl'; import { shoppingCartUrl } from '../../../common/globalImagesUrl';
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
const bkgUrl = ref(shoppingCartUrl + '/newaddress_info/bkg.png')
const isSelected = ref(false) const isSelected = ref(false)
const addressParam = ref({ const addressParam = ref({
name: "", name: "",
@ -180,7 +181,6 @@ const bindTimeChange = (e) => { //picker省市区选择
.page { .page {
padding-top: 26.44rpx; padding-top: 26.44rpx;
// background-color: #fffaf0; // background-color: #fffaf0;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/Shopping-cart/newaddress_Info/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;

650
pages/Shopping-cart/productmain/productmain.vue
View File

@ -1,650 +0,0 @@
<!-- 购物车的详细页面 包含服务类和商品类 -->
<template>
<view class="flex-col page">
<view class="flex-col">
<view class="flex-col justify-start items-end text-wrapper"><text class="font text" @click="changeState">{{ stateText.topBtn }}</text></view>
<!-- <view class="flex-col justify-start items-end text-wrapper"><text class="font text">完成</text></view> -->
<view class="flex-col section">
<view class="flex-row justify-between self-stretch group">
<text class="font text_2" :style="getTextStyle(1)" @click="changeType(1)">商品类</text>
<text class="font" :style="getTextStyle(2)" @click="changeType(2)">服务类</text>
</view>
</view>
<view class="flex-col list">
<checkbox-group @change="checkBoxChange">
<view class="flex-col list-item mt-8" v-for="(item, index) in products" :key="index">
<!-- 实体类商品 -->
<view class="flex-row section_1" v-if="current == 1">
<!-- 多选框 -->
<checkbox class="shrink-0 self-center image_2" :value="index" :checked="item.checked"/>
<view class="flex-row flex-1 self-center group_2">
<image
class="shrink-0 image"
:src="item.cartGoodVO.goodImg.split(';')[0]"
@click="jump_product(item.goodId)"
/>
<view class="flex-col flex-1 group_3 ml-12">
<view class="flex-row group_4">
<text class="font_2" @click="jump_product(item.goodId)">{{ item.cartGoodVO.name }}</text>
<text class="font_2 ml-4" @click="jump_product(item.goodId)">【{{ item.cartGoodVO.type }}】</text>
</view>
<view class="flex-row items-center mt-47">
<view class="flex-row items-center self-stretch group_5">
<text class="font_3 text_3" @click="jump_product(item.goodId)"><text class="font_4">￥</text>{{ item.cartGoodVO.price }}</text>
<!-- <image
class="image_6"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJipaVPoQ-storeRmb.png"
/> -->
</view>
</view>
</view>
</view>
<!-- 减少数量 -->
<image
class="shrink-0 self-start image_3 image_4"
:src="shoppingCartUrl + '/productmain/sub.png'"
@click="decrease(index , item.checked)"
/>
<view class="flex-row shrink-0 self-start group_9">
<view class="flex-col justify-start items-center text-wrapper_2"><text class="font_5 text_4">{{ item.quantity }}</text></view>
<!-- 添加数量 -->
<image
class="image_5 ml-2"
:src="shoppingCartUrl + '/productmain/add.png'"
@click="increase(index , item.checked)"
/>
</view>
</view>
<!-- 服务类商品 -->
<view class="flex-col list-item mt-8" v-for="(item, index) in products" :key="index">
<view class="flex-col list-item_2 mt-8" v-if="current == 2">
<view class="flex-row">
<image
class="shrink-0 self-start image_2 image_8"
src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=radio.png"
/>
<image
class="shrink-0 image_7"
src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=service.png"
/>
<view class="flex-col flex-1 group_1">
<text class="font_6">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text>
<view class="flex-row justify-between items-center section_3 mt-7">
<view class="flex-col items-start">
<text class="font_7">仿真丝团扇;上午场(09:30-12:00)</text>
<text class="font_8 text_5 mt-6">预约日期：2024-10-15</text>
</view>
<image
class="image_9"
src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=pull.png"
/>
</view>
</view>
</view>
<view class="flex-row justify-end items-center group_7 mt-14">
<view class="flex-row items-center">
<text class="font_3 text_6">138.</text>
<image
class="shrink-0 image_6"
src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=storeRmb.png"
/>
<text class="font_4 text_7">00</text>
</view>
<view class="flex-row ml-82">
<image
class="image_3"
src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=short1.png"
/>
<view class="flex-col justify-start items-center text-wrapper_2 ml-2">
<text class="font_5 text_8">1</text>
</view>
<image
class="image_5 ml-2"
src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=add1.png"
/>
</view>
</view>
</view>
</view>
</view>
</checkbox-group>
</view>
</view>
<view class="flex-row justify-between items-center section_4 mt-569">
<view class="flex-row items-center">
<checkbox class="shrink-0 image_2" :checked="allCheck" @tap="allChecked"/>
<text class="ml-10 font text_10">全选</text>
</view>
<view class="flex-row items-center group_3">
<text class="font">合计：</text>
<image
class="shrink-0 image_7 image_9"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJipaVPoQ-storeRmb.png"
/>
<text class="font text_12">{{ totalPrice }}</text>
<view class="flex-col justify-start items-center shrink-0 text-wrapper_3" @click="editOrSettle"><text class="text_11">{{ stateText.bottomBtn }}</text></view>
<!-- <view class="flex-col justify-start items-center shrink-0 text-wrapper_3"><text class="text_11">删除</text></view> -->
</view>
</view>
</view>
</template>
<script setup>
import { ref , onMounted , toRaw} from 'vue'
import { onShow , onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont';
import { baseUrl , testUrl ,suiUrl} from '../../../api/request';
import * as math from 'mathjs'
import { shoppingCartUrl } from '../../../common/globalImagesUrl';
const products = ref([])
const current = ref(1) //用于判断是实体类商品还是服务类商品
const allCheck = ref(false) //全选
const checkedData = ref([]) //选择的暂存保存数组
const totalPrice = ref(0)
const stateText = ref({
topBtn: '编辑',
bottomBtn: '去结算'
})
//服务类商品
const serviceProduct = ref([])
onShow(()=>{
getProductCart() //获取商品类
getServiceCart() //获取服务类
})
onLoad(()=>{
getFonts()
getProductCart() //再获取一次实体类商品的列表
getServiceCart() //再获取一次
})
//小程序刷新根据用户id获取购物车信息
const getProductCart = async ()=>{
const res = await uni.request({
url: baseUrl + '/cart/list',
method: 'POST',
header: {
'cookie': wx.getStorageSync('cookie')
}
})
// console.log('res--->',res.data);
if(res.data.code === 1) {
products.value = res.data.data
products.value.forEach((item)=>{
item.checked = false
})
}
console.log('products-->',products.value);
}
const deleteProduct = async (idArr) =>{ //删除商品
const res = await uni.request({
url: baseUrl + '/cart/delete',
method: 'POST',
data: idArr ,
header: {
'cookie': wx.getStorageSync('cookie')
}
})
console.log(res.data);
if(res.data.code === 1) {
// getProductCart() //重新获取购物车信息
uni.reLaunch({
url: '/pages/Shopping-cart/productmain/productmain'
})
totalPrice.value = 0
}
}
const getServiceCart = async () => {
console.log('获取服务类商品方法被触发');
}
//更改实体商品和服务类方法
const changeType = async (num)=>{
current.value = num;
if (num === 1 ) { //为一的时候就获取用户商品购物车
}
}
//更改下划线
const getTextStyle = (num) => ({
'border-bottom' : current.value === num ? '2px solid orange' : '2px solid #ffffff'
});
//复选框绑定方法
const checkBoxChange =(event)=>{
//如果选中的checkbox的value的数组长度和后端传过来的数组长度相等则为全选状态 allCheck为true
console.log('length---->',event.detail.value.length);
// console.log('product--->',products.value);
if(event.detail.value.length == products.value.length) {
allCheck.value = true
} else {
allCheck.value = false
}
checkedData.value = [] //每次都要重置一下
totalPrice.value = 0;
let count = 0; //用于记录checkedData不为null的个数
console.log('event--->',event.detail);
if(event.detail.value.length) {
products.value[parseInt(event.detail.value)].checked = true; //勾选
} else {
products.value.forEach((item)=>{
item.checked = false
})
}
//计算一下总金额
for(let key in event.detail.value) {
let temp = parseInt(event.detail.value[parseInt(key)]) //相当于商品数组下标
computed(products.value[temp].cartGoodVO.price , products.value[temp].quantity)
}
event.detail.value.forEach((item)=>{
products.value[parseInt(item)].checked = true
})
//然后假如checkboxGroup传过来的 detail.value中有某个id则把这些元素的checked属性置为true(选中状态)
products.value.forEach((x)=>{
event.detail.value.forEach((y)=>{
if(x.value == y) {
x.checked = true
}
})
})
event.detail.value.forEach((item)=>{ //将选中的商品信息赋值给checkedData
console.log('products.value[parseInt(item)].goodId',products.value[parseInt(item)].goodId);
if(products.value[parseInt(item)] !== null) {
checkedData.value.push(products.value[parseInt(item)].id)
// console.log(products.value[parseInt(item)].goodId);
count += 1
}
})
console.log('checkedData--->',checkedData.value);
//将选中的数组保存在某一个ref中
// checkedData.value = event.detail.value
// console.log('checkedData--->',checkedData.value);
}
//全选方法
const allChecked = ()=>{
allCheck.value = !allCheck.value
totalPrice.value = 0
if ( allCheck.value == true ) {
products.value.forEach((item)=>{
item.checked = true //将全部选项选上
computed(item.cartGoodVO.price , item.quantity)
})
checkedData.value = products.value.map((item)=>( item.id ))
console.log('checkedData--->',checkedData.value);
} else {
products.value.forEach((item)=>{
item.checked = false //将全部都取消选择
})
}
}
//减少商品
const decrease =(index , item)=>{ //item用于监测是否选中
console.log('decrease,index-->',index);
console.log('decrease,item-->',item);
if(products.value[index].quantity > 1) {
products.value[index].quantity -= 1
if(item && products.value[index].quantity >= 1) {
computed(-products.value[index].cartGoodVO.price, 1)
}
}
}
//增加商品的方法
const increase =(index , item) =>{ //item用于监测是否选中
console.log('increase,index-->',index);
console.log('increase,item-->',item);
if(products.value[index].quantity < products.value[index].cartGoodVO.inventory) {
if(item && products.value[index].quantity <= products.value[index].cartGoodVO.inventory) {
computed(products.value[index].cartGoodVO.price, 1)
}
products.value[index].quantity += 1
}
}
//计算方法
const computed =( price , quantity )=>{
totalPrice.value = math.round(totalPrice.value+price * quantity,2)
return totalPrice.value
}
const jump_product =(gid)=>{
uni.navigateTo({
url:'../../../pages/store-home/ProductDetails/ProductDetails?gid=' + JSON.stringify(gid)
})
}
const editOrSettle = async ()=>{ //去结算或者删除状态方法
// console.log('要传到订单详情页面的checked--->',checkedData.value);
if(stateText.value.bottomBtn === '去结算') {
if(checkedData.value.length === 0) { //在没有勾选的时候禁止发请求
return;
}
const res = await uni.request({
url: baseUrl + '/cart/submit/error',
method: 'POST',
header: {
'cookie': wx.getStorageSync('cookie')
}
})
console.log(res.data);
if(res.data.data.length != 0) {
uni.showModal({
title: '提示',
content: '购物车商品发生改变，点击移除变化商品',
showCancel: false,
success: (e)=>{
if(e.confirm) {
// getProductCart() //重新获取购物车信息
uni.reLaunch({
url: '/pages/Shopping-cart/productmain/productmain'
})
}
}
})
} else {
uni.navigateTo({
url: '/pages/order/product-waitpay/product-waitpay?cartInfo=' + JSON.stringify(checkedData.value)
})
checkedData.value.splice(0,checkedData.value.length)
}
} else {
uni.showModal({
title: '提示',
content: '是否删除商品?',
success: (e) => {
if(e.confirm) {
deleteProduct(checkedData.value)
}
else if(e.cancel)
return;
}
})
}
}
const changeState =()=>{ //修改购物车订单方法
if(stateText.value.topBtn === '编辑') {
stateText.value.topBtn = '完成',
stateText.value.bottomBtn = '删除'
} else {
stateText.value.topBtn = '编辑',
stateText.value.bottomBtn = '去结算'
}
}
</script>
<style lang="scss" scoped>
.mt-47 {
margin-top: 88.13rpx;
}
.mt-7 {
margin-top: 13.13rpx;
}
.mt-173 {
margin-top: 324.38rpx;
}
.page {
background-color: #fff;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
height: 100vh;
}
.text-wrapper {
position: fixed;
left: 0;
right: 0;
top: 0;
padding: 25.46rpx 0 25.5rpx;
background-color: #f5f5dc;
}
.font {
font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.69rpx;
color: #323232;
}
.text {
margin-right: 30.86rpx;
line-height: 27.79rpx;
}
.section {
position: fixed;
left: 0;
right: 0;
top: 74rpx;
padding: 0 121.88rpx;
background-color: #fffef8;
}
.group {
padding: 21.64rpx 4.63rpx 18.17rpx 11.42rpx;
}
.text_2 {
line-height: 27.6rpx;
}
.section_2 {
background-color: #fb8b05;
width: 112.5rpx;
height: 5.63rpx;
}
.list {
padding: 155rpx 15rpx 110rpx;
}
.list-item:first-child {
margin-top: 0;
}
.section_1 {
padding: 35.63rpx 20.63rpx 28.13rpx;
background-color: #fffef8;
border-radius: 18.75rpx;
}
.image_2 {
width: 37.5rpx;
height: 37.5rpx;
}
.group_2 {
margin-left: 41.25rpx;
}
.image {
border-radius: 9.38rpx;
width: 146.25rpx;
height: 144.38rpx;
}
.group_3 {
margin-top: 2.19rpx;
}
.group_4 {
padding-left: 8.53rpx;
}
.font_2 {
font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.43rpx;
color: #323232;
}
.group_5 {
width: 90.66rpx;
}
.font_3 {
font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.43rpx;
font-weight: 600;
color: #fb8b05;
}
.text_3 {
margin-left: 25.03rpx;
line-height: 24.88rpx;
}
.image_6 {
margin-left: -90.66rpx;
width: 30rpx;
height: 26.25rpx;
}
.font_4 {
font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 19.29rpx;
font-weight: 600;
color: #fb8b05;
}
.image_3 {
border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
width: 45rpx;
height: 45rpx;
}
.image_4 {
margin-left: 18.15rpx;
margin-top: 106.88rpx;
}
.group_9 {
margin: 106.88rpx 3.77rpx 0 3.75rpx;
}
.text-wrapper_2 {
padding: 12.39rpx 0 13.88rpx;
background-color: #f5f5dc;
width: 58.13rpx;
height: 45rpx;
}
.font_5 {
font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 19.29rpx;
color: #323232;
}
.text_4 {
line-height: 18.73rpx;
}
.image_5 {
border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
width: 45rpx;
height: 45rpx;
}
.list-item_2 {
padding: 24.38rpx 18.75rpx 18.75rpx;
background-color: #fffef8;
border-radius: 18.75rpx;
}
.image_8 {
margin-top: 108.75rpx;
}
.image_7 {
margin-left: 39.38rpx;
width: 121.88rpx;
height: 172.5rpx;
}
.group_1 {
margin: 3.07rpx 17.76rpx 7.5rpx 22.5rpx;
}
.font_6 {
font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.88rpx;
color: #323233;
}
.section_3 {
margin-right: 4.74rpx;
padding: 12.94rpx 9.83rpx 13.09rpx;
background-color: #f5f5dc;
border-radius: 9.38rpx;
}
.font_7 {
font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.5rpx;
color: #6b6e72;
}
.font_8 {
font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 19.29rpx;
color: #6b6e72;
}
.text_5 {
line-height: 20.79rpx;
}
.image_9 {
margin-right: 5.17rpx;
width: 22.5rpx;
height: 22.5rpx;
}
.group_7 {
padding: 0 22.5rpx;
}
.text_6 {
margin-left: 25.03rpx;
line-height: 24.88rpx;
}
.text_7 {
margin-left: 61.14rpx;
}
.text_8 {
line-height: 18.73rpx;
}
.section_4 {
position: fixed;
right: 0;
left: 0;
bottom: 0;
padding: 18.75rpx 18.75rpx 16.88rpx;
background-color: #fffef8;
}
.text_9 {
line-height: 27.64rpx;
}
.text-wrapper_3 {
margin-right: 3.77rpx;
padding: 22.37rpx 0 23.53rpx;
background-color: #ffd45a;
border-radius: 75rpx;
width: 219.38rpx;
height: 76.88rpx;
}
.text_10 {
color: #ffffff;
font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 30.97rpx;
}
.mt-569 {
margin-top: 1066.88rpx;
}
.image_2 {
width: 37.5rpx;
height: 37.5rpx;
}
.image_7 {
width: 30rpx;
height: 26.25rpx;
}
.section_4 {
padding: 18.75rpx;
background-color: #fffef8;
}
.font {
font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.54rpx;
color: #323232;
}
.text_10 {
line-height: 27.64rpx;
}
.group_3 {
margin-right: 3.75rpx;
}
.image_9 {
margin-left: -11.25rpx;
}
.text_12 {
color: #fb8b05;
line-height: 22.01rpx;
}
.text-wrapper_3 {
margin-left: 22.5rpx;
padding: 22.5rpx 0;
background-color: #ffd45a;
border-radius: 75rpx;
width: 219.38rpx;
height: 76.88rpx;
}
.text_11 {
color: #ffffff;
font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.48rpx;
}
@import url(../../../common/css/global.css);
</style>

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

@ -1,10 +1,10 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<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"
:src="shoppingCartUrl + '/productmain/ss.png'" /> :src="shoppingCartUrl + '/productmain/search.png'" />
<input confirm-type="search" @confirm="gotoSearch" v-model="searchText" class="section_1 ml-4" placeholder="搜索购物车商品" /> <input confirm-type="search" @confirm="gotoSearch" v-model="searchText" class="section_1 ml-4" placeholder="搜索购物车商品" />
</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>
@ -18,7 +18,7 @@
<view @click="changeType(2)"> <view @click="changeType(2)">
<text class="font_2 text_4">服务类</text> <text class="font_2 text_4">服务类</text>
<view class="flex-col justify-start items-center" v-if="!isShowLine" style="border: 1.88rpx solid #E79EA1; width: 90rpx; margin-top: 10rpx;"></view> <view class="flex-col justify-start items-center" v-if="!isShowLine" style="border: 1.88rpx solid #E79EA1; width: 90rpx; margin-top: 10rpx;"></view>
</view> </view>
</view> </view>
</view> </view>
<view class="flex-col list"> <view class="flex-col list">
@ -29,7 +29,7 @@
<!-- 多选框 --> <!-- 多选框 -->
<checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked" /> <checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked" />
<view class="flex-row items-end flex-1 self-center ml-22"> <view class="flex-row items-end flex-1 self-center ml-22">
<image class="shrink-0 image_2" :src="item.cartGoodVO.goodImg.split(';')[0]" <image class="shrink-0 image_2" :src="item.cartGoodVO.goodImg.split(';')[0]" mode="aspectFill"
@click="jump_product(item.goodId)" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"/> @click="jump_product(item.goodId)" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"/>
<view class="flex-col flex-1 group_2"> <view class="flex-col flex-1 group_2">
<view class="flex-row justify-center group_3" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view class="flex-row justify-center group_3" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
@ -128,6 +128,7 @@
import { baseUrl, testUrl, suiUrl } from '../../../api/request'; import { baseUrl, testUrl, suiUrl } from '../../../api/request';
import * as math from 'mathjs' import * as math from 'mathjs'
import { shoppingCartUrl } from '../../../common/globalImagesUrl'; import { shoppingCartUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(shoppingCartUrl + '/productmain/bkg.png')
const products = ref([]) const products = ref([])
const current = ref(1) //用于判断是实体类商品还是服务类商品 const current = ref(1) //用于判断是实体类商品还是服务类商品
const allCheck = ref(false) //全选 const allCheck = ref(false) //全选
@ -636,7 +637,6 @@
} }
.page { .page {
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -907,7 +907,7 @@
.text_9 { .text_9 {
// margin-left: 25.14rpx; // margin-left: 25.14rpx;
line-height: 24.88rpx; line-height: 24.88rpx;
margin-right: 56rpx; margin-right: 36rpx;
} }
.image_12 { .image_12 {

7
pages/book/photoProductDetail/photoProductDetail.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
<image <image
class="image pos" class="image pos"
:src="obj.introImg" :src="obj.introImg"
@ -72,6 +72,7 @@
const obj = ref({}) const obj = ref({})
const type = ref('') const type = ref('')
const bookingDateVOList =ref([]) const bookingDateVOList =ref([])
const bkgUrl = ref(bookUrl + '/photoProductDetail/bkg.png')
onLoad((options) => { onLoad((options) => {
getFonts() getFonts()
@ -148,7 +149,6 @@
} }
.page { .page {
background-color: #ffffff; background-color: #ffffff;
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductDetail/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -157,7 +157,6 @@
height: 100%; height: 100%;
} }
.section { .section {
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductDetail/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;

7
pages/book/photoProducts/photoProducts.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
<view class="flex-row equal-division"> <view class="flex-row equal-division">
<view class="flex-col items-center equal-division-item"> <view class="flex-col items-center equal-division-item">
<image <image
@ -73,6 +73,7 @@
const categoryName = ref('') const categoryName = ref('')
const ids = ref([]) const ids = ref([])
const point = ref(0) const point = ref(0)
const bkgUrl = ref(bookUrl + '/photoProductDetail/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
@ -197,7 +198,6 @@
margin-top: 24.38rpx; margin-top: 24.38rpx;
} }
.page { .page {
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProducts/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -206,7 +206,6 @@
height: 100vh; height: 100vh;
} }
.section { .section {
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProducts/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;

8
pages/book/photoProductsOrder/photoProductsOrder.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
<text class="font text pos_2">选择联系人</text> <text class="font text pos_2">选择联系人</text>
<image <image
class="image pos" class="image pos"
@ -147,7 +147,7 @@
const type = ref('') const type = ref('')
const contactTemplateString = ref('请选择') const contactTemplateString = ref('请选择')
const bkgUrl = ref(bookUrl + '/photoProductsOrder/bkg.png')
function showLoading() { function showLoading() {
if (!loading) { if (!loading) {
@ -472,7 +472,6 @@
} }
.page { .page {
background-color: #ffffff; background-color: #ffffff;
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductsOrder/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -481,7 +480,6 @@
height: 100%; height: 100%;
} }
.section { .section {
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductsOrder/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;

8
pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="shrink-0 section"></view> <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
<view class="flex-col section_2 pos"> <view class="flex-col section_2 pos">
<view class="flex-row justify-between group"> <view class="flex-row justify-between group">
<view class="flex-col justify-start items-center text-wrapper" @click="changeState(0)"> <view class="flex-col justify-start items-center text-wrapper" @click="changeState(0)">
@ -129,7 +129,7 @@
const deleteBookingOrder = ref(null) const deleteBookingOrder = ref(null)
const advanceOrderList = ref([]) const advanceOrderList = ref([])
const isShowMask = ref(false) const isShowMask = ref(false)
const bkgUrl = ref(bookUrl + '/photoProductsOrderDetail/bkg.png')
onLoad((options) => { onLoad((options) => {
getFonts() getFonts()
}) })
@ -479,7 +479,6 @@ button::after{
.page { .page {
background-color: #ffffff; background-color: #ffffff;
overflow: hidden; overflow: hidden;
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductsOrderDetail/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -488,7 +487,6 @@ button::after{
height: 100%; height: 100%;
} }
.section { .section {
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductsOrderDetail/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;

7
pages/coupon/CouponMall/CouponMall.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="my-box"> <view class="my-box">
<view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">积分商城</text></view> <view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">积分商城</text></view>
@ -65,6 +65,7 @@
const exchange = ref(null) const exchange = ref(null)
const coupon = ref(0) const coupon = ref(0)
const bkgUrl = ref(couponUrl + '/CouponMall/bkg.png')
const closeConfirmPopupHandler = () => { const closeConfirmPopupHandler = () => {
nextTick(() => { nextTick(() => {
@ -191,7 +192,6 @@
} }
.page { .page {
background-color: #ffffff; background-color: #ffffff;
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon/CouponMall/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -200,7 +200,6 @@
height: 100%; height: 100%;
} }
.section { .section {
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon/CouponMall/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;

9
pages/coupon/CouponTips/CouponTips.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">积分规则</text></view> <view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">积分规则</text></view>
<view class="flex-col section_2 pos_2"> <view class="flex-col section_2 pos_2">
<text class="self-start font_2">积分怎么花？</text> <text class="self-start font_2">积分怎么花？</text>
@ -23,6 +23,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { couponUrl } from "../../../common/globalImagesUrl";
import {ref} from 'vue'
const bkgUrl = ref(couponUrl + '/CouponTips/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
@ -31,7 +34,6 @@
<style scoped lang="scss"> <style scoped lang="scss">
.page { .page {
background-color: #ffffff; background-color: #ffffff;
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon/CouponTips/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -45,7 +47,6 @@
} }
.section { .section {
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon/CouponTips/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;

9
pages/coupon/MyCoupon/MyCoupon.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="shrink-0 section"></view> <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">我的优惠券</text></view> <view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">我的优惠券</text></view>
<text class="font_2 text_2 pos_2">优惠券</text> <text class="font_2 text_2 pos_2">优惠券</text>
<view class="flex-col pos_3"> <view class="flex-col pos_3">
@ -31,8 +31,9 @@
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { onShow, onLoad } from "@dcloudio/uni-app"; import { onShow, onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { couponUrl } from '../../../common/globalImagesUrl';
const cookie = wx.getStorageSync("cookie") //请求头 const cookie = wx.getStorageSync("cookie") //请求头
const bkgUrl = ref(couponUrl + '/MyCoupon/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
@ -85,7 +86,6 @@
} }
.page { .page {
overflow: hidden; overflow: hidden;
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon/MyCoupon/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -94,7 +94,6 @@
height: 100%; height: 100%;
} }
.section { .section {
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon/MyCoupon/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;

7
pages/coupon/OverDueCoupon/OverDueCoupon.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="shrink-0 section"></view> <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">我的优惠券</text></view> <view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">我的优惠券</text></view>
<text class="font_2 text_2 pos_2">优惠券</text> <text class="font_2 text_2 pos_2">优惠券</text>
<view class="flex-col pos_3"> <view class="flex-col pos_3">
@ -30,7 +30,8 @@
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { couponUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(couponUrl + '/OverDueCoupon/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })

7
pages/home/home.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<image class="image pos" :src="homeUrl + '/flower.png'" /> <image class="image pos" :src="homeUrl + '/flower.png'" />
<text class="text pos_6">限定手制|非量售卖</text> <text class="text pos_6">限定手制|非量售卖</text>
<text class="font pos_2">匠</text> <text class="font pos_2">匠</text>
@ -56,6 +56,7 @@ import { baseUrl, testUrl , suiUrl} from '@/api/request';
import { onShow,onLoad } from "@dcloudio/uni-app"; import { onShow,onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../common/globalFont'; import { getFonts } from '../../common/globalFont';
import { homeUrl } from '../../common/globalImagesUrl'; import { homeUrl } from '../../common/globalImagesUrl';
const bkgUrl = ref(homeUrl + '/bkg.png')
onShow(() => { onShow(() => {
uni.removeStorageSync('businessId') uni.removeStorageSync('businessId')
getMyUser() getMyUser()
@ -122,7 +123,7 @@ const showStop =()=>{
margin-left: 4.13rpx; margin-left: 4.13rpx;
} }
.page { .page {
background-image: url(https://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/home/bkg.png); // background-image: url(https://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/home/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;

8
pages/login/login.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col items-start relative page"> <view class="flex-col items-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section_2"></view> <view class="section_2" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
<image <image
class="image" class="image"
:src="loginUrl + '/flower.png'" :src="loginUrl + '/flower.png'"
@ -25,6 +25,7 @@ import { onMounted } from 'vue';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../common/globalFont'; import { getFonts } from '../../common/globalFont';
import { loginUrl } from '../../common/globalImagesUrl'; import { loginUrl } from '../../common/globalImagesUrl';
const bkgUrl = ref(loginUrl + '/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
@ -76,7 +77,6 @@ const loginUser = async ( code ) =>{
<style lang="scss" scoped> <style lang="scss" scoped>
.page { .page {
background-image: url(https://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/login/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -101,7 +101,7 @@ const loginUser = async ( code ) =>{
} }
.font { .font {
font-size: 240rpx; font-size: 240rpx;
font-family: FangZhengXiaoZhuan; font-family: FZXiaoZhuanTi-S13T;
line-height: 288.75rpx; line-height: 288.75rpx;
color: #9d2624; color: #9d2624;
} }

4
pages/mine/Contact/testContact.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-col section"> <view class="flex-col section">
<view class="flex-col justify-start items-center text-wrapper"><text class="text">联系人列表</text></view> <view class="flex-col justify-start items-center text-wrapper"><text class="text">联系人列表</text></view>
<view class="mt-10 flex-col list"> <view class="mt-10 flex-col list">
@ -43,6 +43,7 @@
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import contactPopVue from '../component/contactPop.vue'; //导入联系人弹窗 import contactPopVue from '../component/contactPop.vue'; //导入联系人弹窗
import { mineUrl } from '../../../common/globalImagesUrl'; import { mineUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(mineUrl + '/Contact/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
@ -138,7 +139,6 @@
.page { .page {
height: 100vh; height: 100vh;
width: 100%; width: 100%;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/mine/Contact/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;

5
pages/mine/addressList/addressList.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-col list"> <view class="flex-col list">
<view class="flex-col list-item mt-10" v-for="(item, index) in addressArr" :key="index"> <view class="flex-col list-item mt-10" v-for="(item, index) in addressArr" :key="index">
<view class="flex-row justify-between items-center"> <view class="flex-row justify-between items-center">
@ -42,7 +42,7 @@ import { onShow, onLoad } from '@dcloudio/uni-app';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { mineUrl } from '../../../common/globalImagesUrl'; import { mineUrl } from '../../../common/globalImagesUrl';
const addressArr = ref([]) //地址数组 const addressArr = ref([]) //地址数组
const bkgUrl = ref(mineUrl + '/addressList/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
@ -112,7 +112,6 @@ const jump_newAddress =()=> {
} }
.page { .page {
padding-top: 31.88rpx; padding-top: 31.88rpx;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/mine/addressList/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;

4
pages/mine/component/contactPop.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<!-- 添加联系人页面 --> <!-- 添加联系人页面 -->
<view class="flex-row relative page"> <view class="flex-row relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<text class="text pos_2">添加联系人</text> <text class="text pos_2">添加联系人</text>
<image class="image pos" :src="mineUrl + '/component/cha.png'" @click="closePop()"/> <image class="image pos" :src="mineUrl + '/component/cha.png'" @click="closePop()"/>
<view class="flex-col section_2 pos_3"> <view class="flex-col section_2 pos_3">
@ -30,6 +30,7 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { mineUrl } from '../../../common/globalImagesUrl'; import { mineUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(mineUrl + '/component/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
@ -139,7 +140,6 @@ const closePop = () =>{ //关闭弹窗方法
.page { .page {
padding: 18.75rpx 24.38rpx 30rpx 31.88rpx; padding: 18.75rpx 24.38rpx 30rpx 31.88rpx;
background-color: #ffffff; background-color: #ffffff;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/mine/component/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 100vh; height: 100vh;

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

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<image class="imgPos_1" :src="mineUrl + '/main/mh.png'" /> <image class="imgPos_1" :src="mineUrl + '/main/mh.png'" />
<image class="imgPos_2" :src="mineUrl + '/main/hb.png'" /> <image class="imgPos_2" :src="mineUrl + '/main/hb.png'" />
@ -63,7 +63,7 @@
:src="mineUrl + '/main/contact.png'" /> :src="mineUrl + '/main/contact.png'" />
<image class="self-start image_4 image_7" <image class="self-start image_4 image_7"
:src="mineUrl + '/main/yjt.png'" /> :src="mineUrl + '/main/yjt.png'" />
<text class="font_2 pos_3">联系人列表</text> <text class="font_2 pos_3">联系人列表</text>
<view class="divider pos_4"></view> <view class="divider pos_4"></view>
</view> </view>
</view> </view>
@ -120,6 +120,7 @@ import {
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { mineUrl } from '../../../common/globalImagesUrl'; import { mineUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(mineUrl + '/main/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() //启动使从服务器下载字体 getFonts() //启动使从服务器下载字体
}) })
@ -196,12 +197,12 @@ const userLogout = () => {
let tempFile = '' let tempFile = ''
const myAvatar = ref('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQbtEasUN-VCG211285566731.png') const myAvatar = ref(mineUrl + '/main/avatar.png')
const onChooseAvatar = (e) => { const onChooseAvatar = (e) => {
tempFile = e.detail.avatarUrl tempFile = e.detail.avatarUrl
console.log(tempFile) console.log(tempFile)
uni.uploadFile({ uni.uploadFile({
url: baseUrl + '/file/upload/single', url: baseUrl + 'file/uploadFile',
filePath: tempFile, filePath: tempFile,
name: 'file', name: 'file',
header: { header: {
@ -275,7 +276,6 @@ const getMyUser = async () => {
.page { .page {
padding: 100rpx 0 211.88rpx; padding: 100rpx 0 211.88rpx;
background-color: #ffffff00; background-color: #ffffff00;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/mine/main/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
overflow-y: hidden; overflow-y: hidden;
@ -496,6 +496,7 @@ const getMyUser = async () => {
.group_7 { .group_7 {
padding: 28.13rpx 7.5rpx 0; padding: 28.13rpx 7.5rpx 0;
z-index: 9;
} }
.image_12 { .image_12 {

6
pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="flex-row section_2 pos"> <view class="flex-row section_2 pos">
<image <image
class="self-center image" class="self-center image"
@ -135,6 +135,7 @@
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { myOrderUrl } from '../../../common/globalImagesUrl.js'; import { myOrderUrl } from '../../../common/globalImagesUrl.js';
const bkgUrl = ref(myOrderUrl + '/myGeneralOrderDetail/bkg.png')
const order = ref({}) const order = ref({})
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
let orderId = '' let orderId = ''
@ -404,7 +405,6 @@ button::after{
} }
.page { .page {
background-color: #fff; background-color: #fff;
background-image: url(https://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/my-order/myGeneralOrderDetail/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;

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

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col justify-start items-center relative page"> <view class="flex-col justify-start items-center relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<!-- <image <!-- <image
class="image_3" class="image_3"
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=666fe70fbe2b3eb6bec964adf12deccc.png" src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=666fe70fbe2b3eb6bec964adf12deccc.png"
@ -148,6 +148,7 @@
let loading = false; let loading = false;
let isLoading = ref(false) let isLoading = ref(false)
let isShow = ref(false) let isShow = ref(false)
const bkgUrl = ref(myOrderUrl + '/myOrderList/bkg.png')
const flushOrderList = () => { const flushOrderList = () => {
getMyOrder() getMyOrder()
@ -581,6 +582,17 @@
} }
button{padding: 0;margin: 0;} button{padding: 0;margin: 0;}
button::after{ border: none; } button::after{ border: none; }
.page {
background-color: #ffffff;
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
height: 100vh;
}
.appointmentDate { .appointmentDate {
margin-top: 20.63rpx; margin-top: 20.63rpx;
font-size: 26.25rpx; font-size: 26.25rpx;
@ -606,16 +618,7 @@
.ml-11 { .ml-11 {
margin-left: 20.63rpx; margin-left: 20.63rpx;
} }
.page {
background-color: #ffffff;
background-image: url(https://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/my-order/myGeneralOrderDetail/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
height: 100vh;
}
.pos { .pos {
position: absolute; position: absolute;
left: 0; left: 0;

6
pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="flex-row items-center section_2 pos"> <view class="flex-row items-center section_2 pos">
<image <image
class="image" class="image"
@ -117,6 +117,7 @@
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl'; import { myOrderUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(myOrderUrl + '/photoProductDetail/bkg.png')
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
let orderId = '' let orderId = ''
const order = ref({}) const order = ref({})
@ -349,7 +350,6 @@ button::after{
} }
.page { .page {
background-color: #ffffff; background-color: #ffffff;
background-image: url(https://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/my-order/myServiceOrderDetail/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;

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

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<!-- <view class="section"></view> --> <!-- <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;">
@ -18,6 +18,7 @@
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl'; import { myOrderUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(myOrderUrl + '/photoProductDetail/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
@ -43,7 +44,6 @@
} }
.page { .page {
background-color: #ffffff; background-color: #ffffff;
background-image: url(https://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/my-order/researchOrder/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;

7
pages/order/component/addressComponent.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-row justify-center items-center self-stretch relative section_2"> <view class="flex-row justify-center items-center self-stretch relative section_2">
<text class="text">收货地址</text> <text class="text">收货地址</text>
<image <image
@ -50,7 +50,7 @@ const addressList = ref([])
const userInfo = wx.getStorageSync('userInfo') const userInfo = wx.getStorageSync('userInfo')
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
//页面跳转回来之后，刷新一次地址列表 onShow就是在页面显示后执行 //页面跳转回来之后，刷新一次地址列表 onShow就是在页面显示后执行
const bkgUrl = ref(orderUrl + '/component/bkg.png')
const updateAddresssListHandler = () => { const updateAddresssListHandler = () => {
getAddressList() getAddressList()
} }
@ -150,9 +150,8 @@ const closeWindow =()=> {
margin-left: 20.57rpx; margin-left: 20.57rpx;
} }
.page { .page {
background-color: #f5f5dc; background-color: #fff;
border-radius: 28.05rpx 28.05rpx 0rpx 0rpx; border-radius: 28.05rpx 28.05rpx 0rpx 0rpx;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/order/component/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;

8
pages/order/component/contactsComponent.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<!-- 订单的联系人选择页面 --> <!-- 订单的联系人选择页面 -->
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-row justify-between self-end group"> <view class="flex-row justify-between self-end group">
<text class="text">联系人信息</text> <text class="text">联系人信息</text>
<image <image
@ -54,11 +54,14 @@
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import contactPopVue from '../../mine/component/contactPop.vue'; //导入联系人弹窗 import contactPopVue from '../../mine/component/contactPop.vue'; //导入联系人弹窗
import { orderUrl } from '../../../common/globalImagesUrl';
const ContactArr = ref([]) //联系人数组 const ContactArr = ref([]) //联系人数组
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
const selectedContact = ref() //在订单确认页面已经选择的联系人信息 const selectedContact = ref() //在订单确认页面已经选择的联系人信息
const current = ref(0) //当前数组位置 const current = ref(0) //当前数组位置
const bkgUrl = ref(orderUrl + '/component/bkg.png')
const closeContactPopHandler = () => { const closeContactPopHandler = () => {
closeContactPop() closeContactPop()
} }
@ -167,9 +170,8 @@
} }
.page { .page {
padding: 24.75rpx 12.84rpx 33.75rpx 13.13rpx; padding: 24.75rpx 12.84rpx 33.75rpx 13.13rpx;
background-color: #f5f5dc; background-color: #fff;
border-radius: 28.13rpx 28.13rpx 0rpx 0rpx; border-radius: 28.13rpx 28.13rpx 0rpx 0rpx;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/order/component/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;

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

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-col group_1"> <view class="flex-col group_1">
<!-- 地址信息 --> <!-- 地址信息 -->
<view @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
@ -8,10 +8,10 @@
<!-- 商品信息 --> <!-- 商品信息 -->
<view class="flex-col section_3"> <view class="flex-col section_3">
<view class="flex-col self-stretch"> <view class="flex-col self-stretch">
<view class="flex-row items-end group_18" v-for="(item, index) in productArr" :key="index"> <view :style="{marginBottom : index === productArr.length - 1 ? '10rpx' : '20rpx'}" class="flex-row items-end group_18" v-for="(item, index) in productArr" :key="item.id">
<view class="flex-row items-end flex-1 group_19"> <view class="flex-row items-end flex-1 group_19">
<image <image
class="shrink-0 image_3 image_4" class="shrink-0 image_3 image_4" mode="aspectFill"
:src="item.cartGoodVO.goodImg.split(';')[0]" :src="item.cartGoodVO.goodImg.split(';')[0]"
/> />
<view class="flex-col flex-1 ml-17"> <view class="flex-col flex-1 ml-17">
@ -20,11 +20,11 @@
<text class="font text_1">【{{ item.cartGoodVO.type }}】</text> <text class="font text_1">【{{ item.cartGoodVO.type }}】</text>
</view> </view>
<view class="flex-row items-center mt-52"> <view class="flex-row items-center mt-52">
<image <!-- <image
class="image_7" class="image_7"
:src="orderUrl + '/product-waitpay/money.png'" :src="orderUrl + '/product-waitpay/money.png'"
/> /> -->
<text class="font_4 ml-2">{{ item.cartGoodVO.price }}</text> <text class="font_4 ml-2">￥{{ item.cartGoodVO.price.toFixed(2) }}</text>
<!-- <text class="font_6 text_27 ml-2">00</text> --> <!-- <text class="font_6 text_27 ml-2">00</text> -->
</view> </view>
</view> </view>
@ -53,11 +53,11 @@
<text class="font_8 ml-7">共{{ productArr.length }}件商品</text> <text class="font_8 ml-7">共{{ productArr.length }}件商品</text>
</view> </view>
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <!-- <image
class="shrink-0 image_9" class="shrink-0 image_9"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"
/> /> -->
<text class="font_9">{{ sumprice.toFixed(2) }}</text> <text class="font_9">￥{{ sumprice.toFixed(2) }}</text>
</view> </view>
</view> </view>
<view class="flex-col mt-25"> <view class="flex-col mt-25">
@ -75,11 +75,11 @@
<view class="flex-row justify-between items-center group_12"> <view class="flex-row justify-between items-center group_12">
<text class="font_7 text_18">合计</text> <text class="font_7 text_18">合计</text>
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <!-- <image
class="shrink-0 image_9" class="shrink-0 image_9"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"
/> /> -->
<text class="font_9">{{ sfAmount.toFixed(2) }}</text> <text class="font_9">￥{{ sfAmount.toFixed(2) }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -93,13 +93,8 @@
</view> </view>
<view class="flex-row justify-between items-center section_7 pos_8"> <view class="flex-row justify-between items-center section_7 pos_8">
<view class="flex-row items-center"> <view class="flex-row items-center">
<image
class="shrink-0 image_9 image_11"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"
/>
<text class="text_21">应付：</text> <text class="text_21">应付：</text>
<text class="text_22">{{ sfAmount.toFixed(2) }}</text> <text class="text_22">￥{{ sfAmount.toFixed(2) }}</text>
<!-- <text class="text_24">00</text> -->
</view> </view>
<view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"><text class="font_7 text_23">微信支付</text></view> <view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"><text class="font_7 text_23">微信支付</text></view>
</view> </view>
@ -133,6 +128,7 @@ import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction'; import { dealResult } from '../../../common/globalFunction';
import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue'; import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue';
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(orderUrl + '/product-waitpay/bkg.png')
//一些暂时变量 //一些暂时变量
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
//11.4开发 不应该删掉的 //11.4开发 不应该删掉的
@ -543,7 +539,6 @@ const wxPay = async( oid )=> { //传入订单id
} }
.page { .page {
background-color: #fff; background-color: #fff;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/order/product-waitpay/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -611,7 +606,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.section_3 { .section_3 {
margin-top: 16.88rpx; margin-top: 16.88rpx;
padding: 22.5rpx 0 35.63rpx; padding: 22.5rpx 0 12.63rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
@ -622,6 +617,8 @@ const wxPay = async( oid )=> { //传入订单id
} }
.group_19 { .group_19 {
margin-bottom: 3.75rpx; margin-bottom: 3.75rpx;
display: flex;
align-items: center;
} }
.image_3 { .image_3 {
border-radius: 9.38rpx; border-radius: 9.38rpx;
@ -758,7 +755,7 @@ const wxPay = async( oid )=> { //传入订单id
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
.text_19 { .text_19 {
color: #000000; color: #323232;
line-height: 29.53rpx; line-height: 29.53rpx;
} }
.text-wrapper_2 { .text-wrapper_2 {
@ -788,14 +785,13 @@ const wxPay = async( oid )=> { //传入订单id
margin-left: 85.31rpx; margin-left: 85.31rpx;
} }
.text_21 { .text_21 {
margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_22 { .text_22 {
margin-left: 28.5rpx;
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;

110
pages/order/serviceWaitPay/serviceWaitPay.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<!-- 批量服务类商品购买 --> <!-- 批量服务类商品购买 -->
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-row justify-between items-center section_2"> <view class="flex-row justify-between items-center section_2">
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <image
@ -29,7 +29,7 @@
<!-- <text class="font">{{ item.cartExperienceGoodVO }}</text> --> <!-- <text class="font">{{ item.cartExperienceGoodVO }}</text> -->
<text class="font text_3">【{{ item.cartExperienceGoodVO.type }}】 {{item.cartExperienceGoodVO.name}} </text> <text class="font text_3">【{{ item.cartExperienceGoodVO.type }}】 {{item.cartExperienceGoodVO.name}} </text>
</view> </view>
<text class="self-start font_2 text_7 mt-9">已选时间：{{ item.reservationDate }}星期二</text> <text class="self-start font_2 text_7 mt-9">已选时间：{{ item.reservationDate }} {{ getWeekday(item.reservationDate) }}</text>
<text class="self-start font_3 text_8 mt-9">{{ item.timeSlot }}</text> <text class="self-start font_3 text_8 mt-9">{{ item.timeSlot }}</text>
<view class="flex-row justify-between items-end self-stretch mt-9"> <view class="flex-row justify-between items-end self-stretch mt-9">
<view class="flex-row items-center"> <view class="flex-row items-center">
@ -110,12 +110,12 @@
</view> </view>
<view class="flex-row justify-between items-center section_6"> <view class="flex-row justify-between items-center section_6">
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <!-- <image
class="shrink-0 image_8 image_10" class="shrink-0 image_8 image_10"
:src="orderUrl + '/serviceWaitPay/money.png'" :src="orderUrl + '/serviceWaitPay/money.png'"
/> /> -->
<text class="text_17">应付：</text> <text class="text_17">应付：</text>
<text class="text_18">{{ sfAmount.toFixed(2) }}</text> <text class="text_18">￥{{ sfAmount.toFixed(2) }}</text>
<!-- <text class="text_20">00</text> --> <!-- <text class="text_20">00</text> -->
</view> </view>
<view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" <view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd"
@ -152,6 +152,7 @@
import * as math from 'mathjs' import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction'; import { dealResult } from '../../../common/globalFunction';
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(orderUrl + '/serviceWaitPay/bkg.png')
//一些暂时变量 //一些暂时变量
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
@ -180,6 +181,17 @@
const textColor = ref('') const textColor = ref('')
const delContactByIdHandler = (val) => {
console.log('===============>', val)
if (contactRealInfo.value.id === val) {
console.log(3333)
contactRealInfo.value = {}
contactRealInfo.value.name = '请选择联系人'
}
}
const closeHandler = () => { const closeHandler = () => {
close() close()
} }
@ -214,32 +226,6 @@
} }
onMounted(() => {
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.on('close', closeHandler)
//获取联系人信息
emitter.on('contactsNowInfo', contactsNowInfoHandler)
emitter.on('closeCoupon', closeCouponHandler)
emitter.on('cancelCoupon', cancelCouponHandler)
emitter.on('getCouponObj', getCouponObjHandler)
})
onUnmounted(() => {
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.off('close', closeHandler)
//获取联系人信息
emitter.off('contactsNowInfo', contactsNowInfoHandler)
emitter.off('closeCoupon', closeCouponHandler)
emitter.off('cancelCoupon', cancelCouponHandler)
emitter.off('getCouponObj', getCouponObjHandler)
})
onLoad( async (options)=>{ onLoad( async (options)=>{
getFonts() getFonts()
if(options.cartInfo === undefined) { if(options.cartInfo === undefined) {
@ -255,11 +241,39 @@
} }
await getMyCouponList() await getMyCouponList()
}) })
onShow(()=>{
userInfo.value = wx.getStorageSync('userInfo') //从微信缓存中获取用户信息
getDefaultContact() onMounted(() => {
// computed() //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.on('close', closeHandler)
//获取联系人信息
emitter.on('contactsNowInfo', contactsNowInfoHandler)
emitter.on('closeCoupon', closeCouponHandler)
emitter.on('cancelCoupon', cancelCouponHandler)
emitter.on('getCouponObj', getCouponObjHandler)
emitter.on('delContactById', delContactByIdHandler)
}) })
onUnmounted(() => {
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.off('close', closeHandler)
//获取联系人信息
emitter.off('contactsNowInfo', contactsNowInfoHandler)
emitter.off('closeCoupon', closeCouponHandler)
emitter.off('cancelCoupon', cancelCouponHandler)
emitter.off('getCouponObj', getCouponObjHandler)
emitter.off('delContactById', delContactByIdHandler)
})
//关闭弹窗 //关闭弹窗
const close = () => { const close = () => {
nextTick(() => { nextTick(() => {
@ -281,15 +295,16 @@
cookie: wx.getStorageSync('cookie') cookie: wx.getStorageSync('cookie')
} }
}) })
if(res.data.code === 1) {
console.log('联系人数组---->',res.data.data);
}
//根据for循环遍历默认地址 //根据for循环遍历默认地址
for(let key in res.data.data) { let contactArr = res.data.data
if(res.data.data[key].isDefault === 1) { for(let key in contactArr) {
contactRealInfo.value = res.data.data[key] if(contactArr[key].isDefault === 1) {
contactRealInfo.value = contactArr[key]
} }
} }
if (JudgeIsNullity(contactRealInfo.value.name)) {
contactRealInfo.value.name = '请选择联系人'
}
} }
const createOrder = async () => { //服务类购物车的购买方法 const createOrder = async () => { //服务类购物车的购买方法
console.log('联系人信息-->',contactRealInfo.value); console.log('联系人信息-->',contactRealInfo.value);
@ -488,6 +503,12 @@
console.log('============================>', myCouponList.value) console.log('============================>', myCouponList.value)
} }
function getWeekday(dateStr) {
const date = new Date(dateStr);
const weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
return weekdays[date.getDay()];
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -541,7 +562,6 @@
.page { .page {
padding-top: 24.38rpx; padding-top: 24.38rpx;
background-color: #fff; background-color: #fff;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/order/serviceWaitPay/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -653,7 +673,7 @@
margin-right: 5.63rpx; margin-right: 5.63rpx;
} }
.text-wrapper { .text-wrapper {
padding: 11.31rpx 0 16.46rpx; padding: 11.31rpx 0 11.46rpx;
background-color: #ffaaa5; background-color: #ffaaa5;
width: 58.13rpx; width: 58.13rpx;
height: 45rpx; height: 45rpx;
@ -779,14 +799,14 @@
margin-left: 85.31rpx; margin-left: 85.31rpx;
} }
.text_17 { .text_17 {
margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_18 { .text_18 {
margin-left: 28.5rpx; // margin-left: 28.5rpx;
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;

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

@ -1,6 +1,6 @@
<!-- 单个商品购买页面 --> <!-- 单个商品购买页面 -->
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-col group_1"> <view class="flex-col group_1">
<!-- 地址信息 --> <!-- 地址信息 -->
<view @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
@ -14,18 +14,19 @@
<image <image
class="shrink-0 image_3 image_4" class="shrink-0 image_3 image_4"
:src="productObject.goodImg.split(';')[0]" :src="productObject.goodImg.split(';')[0]"
mode="aspectFill"
/> />
<view class="flex-col ml-17" style="position: relative;"> <view class="flex-col ml-17">
<view class="flex-row" style="position: absolute; top: -35rpx;"> <view class="flex-row">
<text class="font">{{ productObject.name }}</text> <text class="font">{{ productObject.name }}</text>
<text class="font text_1">【{{ productObject.type }}】</text> <text class="font text_1">【{{ productObject.type }}】</text>
</view> </view>
<view class="flex-row items-center mt-52"> <view class="flex-row items-center mt-52">
<image <!-- <image
class="image_7" class="image_7"
:src="orderUrl + '/singleGoodOrder/money.png'" :src="orderUrl + '/singleGoodOrder/money.png'"
/> /> -->
<text class="font_4 ml-2">{{ productObject.price.toFixed(2) }}</text> <text class="font_4 ml-2">￥{{ productObject.price.toFixed(2) }}</text>
<!-- <text class="font_6 text_27 ml-2">00</text> --> <!-- <text class="font_6 text_27 ml-2">00</text> -->
</view> </view>
</view> </view>
@ -53,11 +54,11 @@
<text class="font_8 ml-7">共{{ quantity }}件商品</text> <text class="font_8 ml-7">共{{ quantity }}件商品</text>
</view> </view>
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <!-- <image
class="shrink-0 image_9" class="shrink-0 image_9"
:src="orderUrl + '/singleGoodOrder/money.png'" :src="orderUrl + '/singleGoodOrder/money.png'"
/> /> -->
<text class="font_9">{{ sumprice.toFixed(2) }}</text> <text class="font_9">￥{{ sumprice.toFixed(2) }}</text>
</view> </view>
</view> </view>
<view class="flex-col mt-25"> <view class="flex-col mt-25">
@ -67,7 +68,7 @@
<text class="font_8" :style="{color: textColor}">{{ templateString }}</text> <text class="font_8" :style="{color: textColor}">{{ templateString }}</text>
<image <image
class="shrink-0 image_7 ml-3" class="shrink-0 image_7 ml-3"
:src="orderUrl + '/singleGoodOrder/money.png'" :src="orderUrl + '/singleGoodOrder/yjt2.png'"
/> />
</view> </view>
</view> </view>
@ -75,11 +76,11 @@
<view class="flex-row justify-between items-center group_12"> <view class="flex-row justify-between items-center group_12">
<text class="font_7 text_18">合计</text> <text class="font_7 text_18">合计</text>
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <!-- <image
class="shrink-0 image_9" class="shrink-0 image_9"
:src="orderUrl + '/singleGoodOrder/money.png'" :src="orderUrl + '/singleGoodOrder/money.png'"
/> /> -->
<text class="font_9">{{ sfAmount.toFixed(2) }}</text> <text class="font_9">￥{{ sfAmount.toFixed(2) }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -93,12 +94,9 @@
</view> </view>
<view class="flex-row justify-between items-center section_7 pos_8"> <view class="flex-row justify-between items-center section_7 pos_8">
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <!-- <view class="shrink-0 image_9 image_11"></view> -->
class="shrink-0 image_9 image_11"
:src="orderUrl + '/singleGoodOrder/money.png'"
/>
<text class="text_21">应付：</text> <text class="text_21">应付：</text>
<text class="text_22">{{ sfAmount.toFixed(2) }}</text> <text class="text_22">￥{{ sfAmount.toFixed(2) }}</text>
<!-- <text class="text_24">00</text> --> <!-- <text class="text_24">00</text> -->
</view> </view>
<view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
@ -137,6 +135,7 @@ import * as math from 'mathjs'
import { JudgeIsNullity, dealResult } from '../../../common/globalFunction'; import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue'; import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue';
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(orderUrl + '/singleGoodOrder/bkg.png')
//一些暂时变量 //一些暂时变量
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
//11.4开发 不应该删掉的 //11.4开发 不应该删掉的
@ -558,7 +557,6 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.page { .page {
background-color: #fff; background-color: #fff;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/order/singleGoodOrder/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -646,6 +644,8 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.group_19 { .group_19 {
margin-bottom: 3.75rpx; margin-bottom: 3.75rpx;
display: flex;
align-items: center;
} }
.image_3 { .image_3 {
border-radius: 9.38rpx; border-radius: 9.38rpx;
@ -813,14 +813,13 @@ const wxPay = async ( oid )=> { //传入订单id
margin-left: 85.31rpx; margin-left: 85.31rpx;
} }
.text_21 { .text_21 {
margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_22 { .text_22 {
margin-left: 28.5rpx;
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;

79
pages/order/singleServiceWait/singleServiceWait.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<!-- 批量服务类商品购买 --> <!-- 批量服务类商品购买 -->
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-row justify-between items-center section_2" @click="loadPop" > <view class="flex-row justify-between items-center section_2" @click="loadPop" >
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <image
class="shrink-0 image" class="shrink-0 image"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXymRmdOc-lianxiren.png" :src="orderUrl + '/singleServiceWait/lxr.png'"
/> />
<text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text> <text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
</view> </view>
<view class="flex-row items-center group" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view class="flex-row items-center group" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
<image <image
class="image_2" class="image_2"
:src="orderUrl + '/singleServiceWait/lxr.png'" :src="orderUrl + '/singleServiceWait/yjt.png'"
/> />
<text class="font text_2">更换联系人</text> <text class="font text_2">更换联系人</text>
</view> </view>
@ -23,6 +23,7 @@
<image <image
class="shrink-0 image_3" class="shrink-0 image_3"
:src="singleService.goodImg" :src="singleService.goodImg"
mode="aspectFill"
/> />
<view class="flex-col flex-1 group_5"> <view class="flex-col flex-1 group_5">
<view class="flex-row self-stretch group_3"> <view class="flex-row self-stretch group_3">
@ -110,12 +111,12 @@
</view> </view>
<view class="flex-row justify-between items-center section_6"> <view class="flex-row justify-between items-center section_6">
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <!-- <image
class="shrink-0 image_8 image_10" class="shrink-0 image_8 image_10"
src="https://ide.code.fun/api/image?token=67be64de4ae84d0012274ced&name=549b29459342a9a09d24834be40eb53b.png" src="https://ide.code.fun/api/image?token=67be64de4ae84d0012274ced&name=549b29459342a9a09d24834be40eb53b.png"
/> /> -->
<text class="text_17">应付：</text> <text class="text_17">应付：</text>
<text class="text_18">{{ sfAmount.toFixed(2) }}</text> <text class="text_18">￥{{ sfAmount.toFixed(2) }}</text>
<!-- <text class="text_20">00</text> --> <!-- <text class="text_20">00</text> -->
</view> </view>
<view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"><text class="font_8 text_19">微信支付</text></view> <view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"><text class="font_8 text_19">微信支付</text></view>
@ -150,6 +151,7 @@
import couponPopupVue from '../../coupon/component/couponPopup.vue'; import couponPopupVue from '../../coupon/component/couponPopup.vue';
import { JudgeIsNullity, dealResult } from '../../../common/globalFunction'; import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(orderUrl + '/singleServiceWait/bkg.png')
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
const contactRealInfo = ref({}) //地址页 选择地址传过来的值 进入页面首先是默认地址，若无默认地址，则为空 const contactRealInfo = ref({}) //地址页 选择地址传过来的值 进入页面首先是默认地址，若无默认地址，则为空
@ -174,6 +176,7 @@
const useCouponId = ref(null) const useCouponId = ref(null)
const textColor = ref('') const textColor = ref('')
let goodId = 0
const delContactByIdHandler = (val) => { const delContactByIdHandler = (val) => {
@ -219,6 +222,26 @@
} }
onLoad( async (options)=>{
getFonts()
console.log(options)
goodId = options.id
singleService.value = await getServiceGoodById(goodId)
cnt.value = Number(options.cnt)
restNumber.value = Number(options.rest)
bookDate.value = options.appointmentDate
timeSlot.value = options.timeSlot
sumprice.value = cnt.value * singleService.value.price
sfAmount.value = cnt.value * singleService.value.price
getMyCouponList()
})
onMounted(() => { onMounted(() => {
contactRealInfo.value.name = '请选择联系人' contactRealInfo.value.name = '请选择联系人'
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
@ -250,22 +273,26 @@
emitter.off('delContactById', delContactByIdHandler) emitter.off('delContactById', delContactByIdHandler)
}) })
onLoad((options)=>{
getFonts()
singleService.value = JSON.parse(options.obj) const getServiceGoodById = async (val) => {
cnt.value = JSON.parse(options.cnt) const res = await uni.request({
restNumber.value = JSON.parse(options.rest) url: baseUrl + '/goods/query/service/id',
bookDate.value = options.appointmentDate method: 'POST',
timeSlot.value = options.timeSlot header: {
sumprice.value = cnt.value * singleService.value.price cookie
sfAmount.value = cnt.value * singleService.value.price },
console.log('单个服务类--->',singleService.value); data: {
console.log('商品数量---->',cnt.value); id: val
console.log('时间段---->',timeSlot.value); }
console.log('日期---->',bookDate.value); })
console.log('剩余人数---->',restNumber.value); return res.data.data
getMyCouponList() }
})
//关闭弹窗 //关闭弹窗
const close = () => { const close = () => {
@ -288,9 +315,6 @@
cookie: wx.getStorageSync('cookie') cookie: wx.getStorageSync('cookie')
} }
}) })
if(res.data.code === 1) {
console.log('联系人数组---->',res.data.data);
}
//根据for循环遍历默认地址 //根据for循环遍历默认地址
let contactArr = res.data.data let contactArr = res.data.data
for(let key in contactArr) { for(let key in contactArr) {
@ -534,7 +558,6 @@
.page { .page {
padding-top: 24.38rpx; padding-top: 24.38rpx;
background-color: #fff; background-color: #fff;
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -772,14 +795,14 @@
margin-left: 85.31rpx; margin-left: 85.31rpx;
} }
.text_17 { .text_17 {
margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_18 { .text_18 {
margin-left: 28.5rpx; // margin-left: 28.5rpx;
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;

12
pages/store-home/ProductDetails/ProductDetails.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<!-- <image <!-- <image
mode="aspectFit" mode="aspectFit"
class="self-stretch image" class="self-stretch image"
@ -13,7 +13,7 @@
<view class="flex-col self-stretch section_2"> <view class="flex-col self-stretch section_2">
<view class="self-start group"> <view class="self-start group">
<text class="font text_2">￥</text> <text class="font text_2">￥</text>
<text class="text">{{ goodObject.price }}</text> <text class="text">{{ goodObject.price }}</text>
<text class="discountsText">限时优惠{{ coupon }}元</text> <text class="discountsText">限时优惠{{ coupon }}元</text>
</view> </view>
<view class="flex-row justify-between items-center self-stretch group_2"> <view class="flex-row justify-between items-center self-stretch group_2">
@ -21,7 +21,7 @@
<view class="flex-row items-center group_3" v-if="goodObject.festivalName != null"> <view class="flex-row items-center group_3" v-if="goodObject.festivalName != null">
<image <image
class="image_2" class="image_2"
:src="storeHomeUrl + '/ProductDetail/jr.png'" :src="storeHomeUrl + '/ProductDetails/jr.png'"
/> />
<text class="font text_3 ml-5">{{ goodObject.festivalName }}限定</text> <text class="font text_3 ml-5">{{ goodObject.festivalName }}限定</text>
</view> </view>
@ -29,7 +29,7 @@
<view class="self-stretch divider view"></view> <view class="self-stretch divider view"></view>
<view class="flex-col self-stretch group_4"> <view class="flex-col self-stretch group_4">
<text class="self-stretch font_2"> <text class="self-stretch font_2">
商品简介：{{ goodObject.introDetail }} 商品简介：{{ goodObject.intro }}
<br/> <br/>
</text> </text>
</view> </view>
@ -67,7 +67,7 @@
<button class="flex-col items-center" style="background-color: #ffffff;" open-type="contact" bindcontact="handleContact" session-from="sessionFrom"> <button class="flex-col items-center" style="background-color: #ffffff;" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
<image <image
class="image_4" class="image_4"
:src="storeHomeUrl + '/ProductDetail/lxkf.png'" :src="storeHomeUrl + '/ProductDetails/lxkf.png'"
/> />
<text class="text_19 mt-3">客服</text> <text class="text_19 mt-3">客服</text>
</button> </button>
@ -106,6 +106,7 @@ const imgArr = ref([]) //商品图片数组
const coupon = ref(0) //当前商品可用的优惠卷 const coupon = ref(0) //当前商品可用的优惠卷
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
const richTextcontent = ref('') const richTextcontent = ref('')
const bkgUrl = ref(storeHomeUrl + '/ProductDetails/bkg.png')
//转换上一页面传来的商品 //转换上一页面传来的商品
onLoad((options) => { onLoad((options) => {
@ -221,7 +222,6 @@ button::after {
margin-left: 16.88rpx; margin-left: 16.88rpx;
} }
.page { .page {
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/main/ProductDetail/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 100%; height: 100%;

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

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-row relative page"> <view class="flex-row relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-row justify-between items-center section_2 pos"> <view class="flex-row justify-between items-center section_2 pos">
<!-- <text class="text" style="color: #E79EA1;">商品</text> --> <!-- <text class="text" style="color: #E79EA1;">商品</text> -->
<view class="flex-row items-center section_3" @click="goToSearch"> <view class="flex-row items-center section_3" @click="goToSearch">
@ -72,6 +72,7 @@ import { getFonts } from '../../../common/globalFont';
import carousel from '@/components/vear-carousel/vear-carousel' import carousel from '@/components/vear-carousel/vear-carousel'
import { workshopUrl } from '../../../common/globalImagesUrl'; import { workshopUrl } from '../../../common/globalImagesUrl';
import { storeHomeUrl } from '../../../common/globalImagesUrl'; import { storeHomeUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(storeHomeUrl + '/main/bkg.png')
const currentColor = ref(0); const currentColor = ref(0);
const sort =ref([{}]) //商品类别对象数组 const sort =ref([{}]) //商品类别对象数组
const headerList = ref([{}]) //类别标题和介绍 const headerList = ref([{}]) //类别标题和介绍
@ -239,7 +240,6 @@ input {
} }
.page { .page {
background-color: #ffffff; background-color: #ffffff;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/store-home/main/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 100vh; height: 100vh;

9
pages/workshop/component/timeSelect.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-col group"> <view class="flex-col group">
<view class="flex-row self-stretch group_2"> <view class="flex-row self-stretch group_2">
<image <image
@ -87,6 +87,7 @@
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { bookUrl } from '../../../common/globalImagesUrl'; import { bookUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(bookUrl + '/component/bkg.png')
let selectObj = ref([]) let selectObj = ref([])
let fontColor = ref([]) let fontColor = ref([])
@ -335,11 +336,11 @@
}) })
console.log(res) console.log(res)
if (!dealResult(res)) return ; if (!dealResult(res)) return ;
console.log('==============================>', productObject.value)
uni.navigateTo({ //跳转到待支付页面 uni.navigateTo({ //跳转到待支付页面
//商品信息+数量 //商品信息+数量
url: '/pages/order/singleServiceWait/singleServiceWait?obj=' url: '/pages/order/singleServiceWait/singleServiceWait?id='
+ JSON.stringify(productObject.value) + '&cnt=' + JSON.stringify(cnt.value) + '&rest=' + JSON.stringify(restNumber.value) + productObject.value.id + '&cnt=' + cnt.value + '&rest=' + restNumber.value
+ '&appointmentDate=' + appointmentDate + '&timeSlot=' + timeSlot + '&appointmentDate=' + appointmentDate + '&timeSlot=' + timeSlot
}) })
} }

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

@ -1,10 +1,10 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="flex-col justify-start items-center section_2 pos"> <view class="flex-col justify-start items-center section_2 pos">
<view class="flex-row section_3" style="display: flex; align-items: center;" @click="goToSearch"> <view class="flex-row section_3" style="display: flex; align-items: center;" @click="goToSearch">
<image <image
class="image" 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 />
@ -48,9 +48,10 @@ import { baseUrl } from '../../../api/request';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { workshopUrl } from '../../../common/globalImagesUrl'; import { workshopUrl } from '../../../common/globalImagesUrl';
import carousel from '@/components/vear-carousel/vear-carousel'
const products = ref() const products = ref()
const cookie = wx.getStorageSync("cookie") const cookie = wx.getStorageSync("cookie")
import carousel from '@/components/vear-carousel/vear-carousel' const bkgUrl = ref(workshopUrl + '/index/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
@ -117,7 +118,6 @@ const imgList = ref([{
.page { .page {
background-color: #ffffff; background-color: #ffffff;
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJULGLADX-feiyigongfang.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -126,7 +126,6 @@ const imgList = ref([{
height: 100vh; height: 100vh;
} }
.section { .section {
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJULGLADX-feiyigongfang.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;
@ -134,7 +133,7 @@ const imgList = ref([{
} }
.section_2 { .section_2 {
padding: 25rpx 0; padding: 25rpx 0;
background-color: #ffffff; background-color: #fbdedf;
} }
.pos { .pos {
position: fixed; position: fixed;
@ -145,14 +144,14 @@ const imgList = ref([{
} }
.section_3 { .section_3 {
padding: 0 15rpx; padding: 0 15rpx;
background-color: #f1e8e9; background-color: #fff;
border-radius: 18.75rpx; border-radius: 18.75rpx;
width: 506.25rpx; width: 506.25rpx;
height: 60rpx; height: 60rpx;
} }
.image { .image {
width: 43.13rpx; width: 43.13rpx;
height: 46.88rpx; height: 43.88rpx;
} }
.font { .font {
font-size: 24.38rpx; font-size: 24.38rpx;

22
pages/workshop/productmain/productmain.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-col self-stretch section"> <view class="flex-col self-stretch section">
<image <image
class="image_3" class="image_3"
@ -17,12 +17,12 @@
{{ productObject.introDetail }} {{ productObject.introDetail }}
</text> </text>
</view> </view>
<view class="flex-row items-baseline self-stretch group_2 mt-15"> <!-- <view class="flex-row items-baseline self-stretch group_2 mt-15">
<text class="font_3" style="margin-left: 0;">最近可预约时间：{{ specificDate }}</text> <text class="font_3" style="margin-left: 0;">最近可预约时间：{{ specificDate }}</text>
<text class="font_3 ml-1" style="margin-left: 20rpx;">{{ specificTime }}</text> <text class="font_3 ml-1" style="margin-left: 20rpx;">{{ specificTime }}</text>
</view> </view> -->
</view> </view>
<view class="flex-col section_4 mt-6"> <!-- <view class="flex-col section_4 mt-6">
<text class="self-start font text_6">用户须知</text> <text class="self-start font text_6">用户须知</text>
<text class="self-start font_2 text_7 text_1 mt-16"> <text class="self-start font_2 text_7 text_1 mt-16">
1.请根据预约时间，提前10-15分钟到达活动地点，以便顺利参与体验。 1.请根据预约时间，提前10-15分钟到达活动地点，以便顺利参与体验。
@ -37,13 +37,13 @@
<text class="self-stretch font_2 text_10 mt-16"> <text class="self-stretch font_2 text_10 mt-16">
5.如遇特殊情况，如突发疾病或其他不可抗力因素，请及时与客服沟通，我们将根据实际情况处理退款事宜。 5.如遇特殊情况，如突发疾病或其他不可抗力因素，请及时与客服沟通，我们将根据实际情况处理退款事宜。
</text> </text>
</view> </view> -->
</view> </view>
<view class="flex-row section_5"> <view class="flex-row section_5">
<view class="flex-col items-center shrink-0 self-start"> <view class="flex-col items-center shrink-0 self-start">
<image <image
class="image_4" class="image_4"
:src="workshopUrl + '/productmain/lxkf'" :src="workshopUrl + '/productmain/lxkf.png'"
/> />
<text class="text_13 mt-3">客服</text> <text class="text_13 mt-3">客服</text>
</view> </view>
@ -57,7 +57,7 @@
</view> </view>
</view> </view>
</view> </view>
<text class="self-start text_14">服务详情</text> <!-- <text class="self-start text_14">服务详情</text> -->
<image <image
class="self-stretch image_5" class="self-stretch image_5"
:src="productObject.detailImg" :src="productObject.detailImg"
@ -85,6 +85,7 @@ const productObject = ref({})
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
const pObj = {} const pObj = {}
const appointmentDateVOList = ref([]) const appointmentDateVOList = ref([])
const bkgUrl = ref(workshopUrl + '/productmain/bkg.png')
const closeTimeDialogHandler = () => { const closeTimeDialogHandler = () => {
close() close()
@ -217,7 +218,6 @@ const loadPopBook = ()=> {
} }
.section { .section {
padding-bottom: 41.25rpx; padding-bottom: 41.25rpx;
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/productmain/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -327,9 +327,9 @@ const loadPopBook = ()=> {
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
margin-top: 31.88rpx; margin-top: 31.88rpx;
padding: 22.5rpx 33.75rpx 30.13rpx 39.38rpx; padding: 22.5rpx 33.75rpx 30.13rpx 39.38rpx;
background-color: #ffffff; background-color: #ffffff;
} }
.image_4 { .image_4 {
width: 46.88rpx; width: 46.88rpx;

7
pages/workshop/searchGood/searchGood.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="flex-row justify-center section_2 pos"> <view class="flex-row justify-center section_2 pos">
<view class="flex-row items-center section_3"> <view class="flex-row items-center section_3">
<image <image
@ -19,6 +19,7 @@
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { workshopUrl } from '../../../common/globalImagesUrl'; import { workshopUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(workshopUrl + '/searchGood/bkg.png')
const type = ref('') const type = ref('')
const goodList = ref([]) const goodList = ref([])
onLoad((options) => { onLoad((options) => {
@ -55,7 +56,6 @@
margin-left: 16.88rpx; margin-left: 16.88rpx;
} }
.page { .page {
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/searchGood/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -64,7 +64,6 @@
height: 100vh; height: 100vh;
} }
.section { .section {
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/searchGood/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;

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

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
<view class="flex-row justify-center section_2 pos"> <view class="flex-row justify-center section_2 pos">
<view class="flex-row items-center section_3" @click="goToSearch"> <view class="flex-row items-center section_3" @click="goToSearch">
<image <image
@ -37,6 +37,7 @@
const keyword = ref('') const keyword = ref('')
const type = ref(0) const type = ref(0)
const goodList = ref([]) const goodList = ref([])
const bkgUrl = ref(workshopUrl + '/searchResult/bkg.png')
onLoad((options) => { onLoad((options) => {
getFonts() getFonts()
keyword.value = options.keyword keyword.value = options.keyword
@ -149,7 +150,6 @@
margin-top: 9.38rpx; margin-top: 9.38rpx;
} }
.page { .page {
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/searchResult/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 100%; width: 100%;
@ -158,7 +158,6 @@
height: 100vh; height: 100vh;
} }
.section { .section {
background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/searchResult/bkg.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 750rpx; width: 750rpx;