Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
#	pages/store-home/main/testMain.vue

App.vue

@@ -3,41 +3,35 @@
 </template>
 
 <script setup>
-import { onLaunch } from '@dcloudio/uni-app'   
+	import { onLaunch } from '@dcloudio/uni-app'
-//小程序加载的时候调用该方法
+	//小程序加载的时候调用该方法
-onLaunch(()=>{
-	// console.log('onLaunch方法被触发');
-	// getFonts()   //更改全局字体
-})
-
-// const getFonts = () => { //导入字体
-// 	uni.loadFontFace({
-// 		family: 'FangZhengFonts',
-// 		source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.TTF")`,
-// 		success: (res) => {
-// 			console.log('success', res);
-// 		},
-// 		fail: (err) => {
-// 			console.log('err', err);
-// 		}
-// 	})
-// }
 </script>
 
 <style>
-/*每个页面公共css */
+	/*每个页面公共css */
-/* //设置圆角 */
+	/* //设置圆角 */
-checkbox.round .wx-checkbox-input,
+	checkbox.round .wx-checkbox-input,
-checkbox.round .uni-checkbox-input {
+	checkbox.round .uni-checkbox-input {
 		border-radius: 100upx;
 		border: 1px solid #ec6330;
-}
+	}
-/* //设置背景色 */
+
-checkbox.red[checked] .wx-checkbox-input,
+	/* //设置背景色 */
-checkbox.red.checked .uni-checkbox-input {
+	checkbox.red[checked] .wx-checkbox-input,
+	checkbox.red.checked .uni-checkbox-input {
 		background-color: #E79EA1 !important;
 		border-color: #ebebeb !important;
 		color: #ffffff !important;
-}
+	}
-/* //元素使用的时候就是使用 round 和 red */
+
+	/* //元素使用的时候就是使用 round 和 red */
+
+	@font-face {
+		font-family: 'FangZhengFonts';
+		src: url('https://www.carboner.cn:8888/api/file/download/FangZhengFonts.ttf') format('truetype');
+	}
+
+	view {
+		font-family: 'FangZhengFonts';
+	}
 </style>

common/global.js

@@ -4,37 +4,37 @@ import { clothesRentUrl , bookUrl , workshopUrl , myOrderUrl} from "./globalImag
 export const stateList = [   
 	{
 		state: '待支付',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png',
+		img: myOrderUrl + '/myGeneralOrderDetail/dzf.png',
 		msg: '等待买家付款',
 		tips: '超时订单将自动关闭'
 	},
 	{
 		state: '待发货',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
+		img: myOrderUrl + '/myGeneralOrderDetail/dfh.png',
 		msg: '等待卖家发货',
 		tips: '耐心等待'
 	},
 	{
 		state: '已退款',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
+		img: myOrderUrl + '/myGeneralOrderDetail/ytk.png',
 		msg: '订单已退款',
 		tips: '钱款已退还'
 	},
 	{
 		state: '待收货',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
+		img: myOrderUrl + '/myGeneralOrderDetail/dsh.png',
 		msg: '商品已发货，注意查收',
 		tips: '工艺品即将送达，敬请耐心等候。'
 	},
 	{
 		state: '交易成功',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
+		img: myOrderUrl + '/myGeneralOrderDetail/jywc.png',
 		msg: '订单完成，感谢您的支持',
 		tips: '感谢您的支持'
 	},
 	{
 		state: '交易关闭',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
+		img: myOrderUrl + '/myGeneralOrderDetail/jygb.png',
 		msg: '您的订单已关闭',
 		tips: '请您在下次购买前仔细确认'
 	}

common/globalFont.js

@@ -1,14 +1,37 @@
-export const getFonts =()=>{
+import { bkgPubilcPath,loginUrl } from "./globalImagesUrl";
+import { ref } from 'vue';
+const bkgUrl = ref(loginUrl + '/bkg.png')
+//缓存背景图片
+const bkgCache = 'bkgCache';  //缓存的键
 
-	//其他页面
+export const getFonts =()=>{   //改为查询背景图片
-	uni.loadFontFace({
+wx.getStorage({
-		family: 'FangZhengFonts',
+		key: bkgCache,
-		source: `url("https://www.carboner.cn:8888/api/file/download/FangZhengFonts.ttf")`,
+		success: (res) => {
-		success:(res) =>{
+			console.log('缓存图片的路径--->',res.data);
-			console.log('success',res);
+			bkgPubilcPath.value = res.data
 		},
-		fail:(err) => {
+		fail: ()=> {
-			console.log('err',err);
+			wx.downloadFile({
+				url: bkgUrl.value,
+				success: (res) => {
+					console.log('成功res--->',res);
+					if(res.statusCode === 200) {
+						const filePath = res.tempFilePath;
+						wx.setStorage({
+							key: bkgCache,
+							data: filePath
+						});
+						// console.log('图片下载并缓存成功,本地路径--->',filePath);
+						bkgPubilcPath.value= filePath
+					} else {
+						console.log('图片下载失败');
+					}
+				},
+				fail: (err) => {
+					console.log('下载失败',err);
+				}
+			})
 		}
 	})
 }

pages/Shopping-cart/newaddress_Info/newaddress_Info.vue

@@ -1,5 +1,5 @@
 <template>
-<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
   <view class="flex-col group">
     <view class="flex-col self-stretch section mt-15">
       <view class="flex-row items-center group_2">
@@ -54,9 +54,8 @@ import {ref , onMounted, onUnmounted} from 'vue'
 import { testUrl , baseUrl , suiUrl } from '../../../api/request';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { getFonts } from '../../../common/globalFont';
-import { shoppingCartUrl } from '../../../common/globalImagesUrl';
+import { shoppingCartUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 import emitter from '../../../utils/emitter';
-const bkgUrl = ref(shoppingCartUrl + '/newaddress_info/bkg.png')
 const isSelected = ref(false)
 const addressParam = ref({
 	name: "",

pages/Shopping-cart/productmain/testproductmain.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 		<view class="flex-row items-center section_2">
 			<text class="font text">购物车</text>
 			<view class="flex-row items-center flex-1 section_3 ml-17">
@@ -127,9 +127,8 @@
 	import { getFonts } from '../../../common/globalFont';
 	import { baseUrl, testUrl, suiUrl } from '../../../api/request';
 	import * as math from 'mathjs'
-	import { shoppingCartUrl } from '../../../common/globalImagesUrl';
+	import { shoppingCartUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { publicPath } from '../../../common/globalImagesUrl';
-	const bkgUrl = ref(shoppingCartUrl + '/productmain/bkg.png')
 	const products = ref([])
 	const current = ref(1) //用于判断是实体类商品还是服务类商品
 	const allCheck = ref(false) //全选

pages/activity/activityMain/activityMain.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 	  <view class="section"></view>
 	  <text class="text pos">公众号动态</text>
 	  <view class="flex-col pos_2">
@@ -21,8 +21,8 @@
 	import {onMounted, ref} from 'vue'
 	import { homeUrl } from '../../../common/globalImagesUrl';
 	import { baseUrl } from '../../../api/request';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
-	import { getFZXZFont } from '../../../common/globalFont';
+	import { getFZXZFont,getFonts } from '../../../common/globalFont';
 	import { onLoad } from "@dcloudio/uni-app";
 	const bkgUrl =  ref(homeUrl + '/bkg.png')
 	const articleList = ref([])
@@ -30,6 +30,7 @@
 	
 	onLoad(() => {
 		getFZXZFont()
+		getFonts()
 	})
 	
 	onMounted(() => {

pages/book/myPhotoProductDetail/myPhotoProductDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}">
 	  <image
 	    class="image pos" mode="aspectFill"
 	    :src="publicPath + (isShow ? obj.introImg : obj.image)"
@@ -37,7 +37,7 @@
 <script setup>
 	import {nextTick, onMounted, onUnmounted, ref} from 'vue'
 	import { baseUrl } from '../../../api/request';
-	import { bookUrl } from '../../../common/globalImagesUrl';
+	import { bookUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { publicPath } from '../../../common/globalImagesUrl';
 	import { onLoad } from "@dcloudio/uni-app";
 	import clothesAttributeVue from '../../clothesRent/component/clothesAttribute.vue';

pages/book/myPhotoProducts/myPhotoProducts.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}">
 	  <view class="flex-row equal-division flex-box">
 	    <view class="flex-col items-center group equal-division-item" @click="changeSelectedStatus(true)">
 	      <image
@@ -52,11 +52,10 @@
 	import {onMounted, ref} from 'vue'
 	import { bookUrl } from '../../../common/globalImagesUrl';
 	import { baseUrl } from '../../../api/request';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { getFonts } from '../../../common/globalFont';
 	
 	const cookie = wx.getStorageSync("cookie")  //请求头
-	const bkgUrl = ref(bookUrl + '/myPhotoProducts/bkg.png')
 	const xzgl = bookUrl + '/myPhotoProducts/xz-gl.png'
 	const xz = bookUrl + '/myPhotoProducts/xz.png'
 	const fzgl = bookUrl + '/myPhotoProducts/fz-gl.png'

pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}">
 	  <view class="flex-row items-center section_2 pos">
 	    <image
 	      class="image"
@@ -100,13 +100,12 @@
 	import { bookUrl } from '../../../common/globalImagesUrl';
 	import { onLoad } from "@dcloudio/uni-app";
 	import { baseUrl } from '../../../api/request';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { getFonts } from '../../../common/globalFont';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
 	import { photoOrderMap } from '../../../common/global';
 	import emitter from '../../../utils/emitter';
 	
-	const bkgUrl = ref(bookUrl + '/myPhotoProductsOrderDetail/bkg.png')
 	const id = ref(0)
 	const cookie = wx.getStorageSync('cookie')
 	const order = ref({})

pages/book/photoProductDetail/photoProductDetail.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}"></view>
 	  <image
 	    class="image pos" mode="aspectFill"
 	    :src="publicPath + obj.introImg"
@@ -64,7 +64,7 @@
 	import emitter from "../../../utils/emitter";
 	import bookingSelectedVue from "../component/bookingSelected.vue";
 	import { baseUrl } from "../../../api/request";
-	import { bookUrl } from "../../../common/globalImagesUrl";
+	import { bookUrl,bkgPubilcPath } from "../../../common/globalImagesUrl";
 	import { getFonts } from '../../../common/globalFont';
 	import { publicPath } from "../../../common/globalImagesUrl";
 	const cookie = wx.getStorageSync("cookie")  //请求头

pages/book/photoProducts/photoProducts.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}"></view>
 	  <view class="flex-row equal-division">
 	    <view class="flex-col items-center equal-division-item">
 	      <image
@@ -61,7 +61,7 @@
 <script setup lang="ts">
 	import {onMounted, ref} from 'vue'
 	import { baseUrl } from '../../../api/request';
-	import { bookUrl } from '../../../common/globalImagesUrl';
+	import { bookUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { onLoad } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
 	import { publicPath } from '../../../common/globalImagesUrl';
@@ -74,7 +74,6 @@
 	const categoryName = ref('')
 	const ids = ref([])
 	const point = ref(0)
-	const bkgUrl = ref(bookUrl + '/photoProductDetail/bkg.png')
 	
 	onLoad(() => {
 		getFonts()

pages/book/photoProductsOrder/photoProductsOrder.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}"></view>
 	  <text class="font text pos_2">选择联系人</text>
 	  <image
 		class="image pos"
@@ -113,7 +113,7 @@
 	import contactsComponentVue from '../../order/component/contactsComponent.vue';
 	import confirmBookingInfoVue from '../component/confirmBookingInfo.vue';
 	import { onLoad } from "@dcloudio/uni-app";
-	import { bookUrl } from '../../../common/globalImagesUrl';
+	import { bookUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { getFonts } from '../../../common/globalFont';
 	import { publicPath } from '../../../common/globalImagesUrl';
 	import { JudgeIsNullity } from '../../../common/globalFunction';
@@ -151,7 +151,6 @@
 	let loading = false;
 
 	const contactTemplateString = ref('请选择联系人')
-	const bkgUrl = ref(bookUrl + '/photoProductsOrder/bkg.png')
 	
 	function showLoading() {
 	  if (!loading) {

pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
+	  <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}"></view>
 	  <view class="flex-col section_2 pos">
 	    <view class="flex-row justify-between group">
 	      <view class="flex-col justify-start items-center text-wrapper" @click="changeState(0)">
@@ -124,7 +124,7 @@
 	import { onLoad } from "@dcloudio/uni-app";
 	import { baseUrl } from '../../../api/request';
 	import { getFonts } from '../../../common/globalFont';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	const cookie = wx.getStorageSync("cookie")  //请求头
 	const isShow = ref([true, false, false])
 	const cancelBookingOrder = ref(null)
@@ -132,6 +132,7 @@
 	const advanceOrderList = ref([])
 	const tempAdvanceOrderList = ref([])
 	const isShowMask = ref(false)
+	onLoad((options) => {
 	const bkgUrl = ref(bookUrl + '/photoProductsOrderDetail/bkg.png')
 	onLoad(() => {
 		getFonts()

pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}">
 		<view class="flex-row justify-between section_2 pos">
 
 			<view @click="isSelectedState(0)">
@@ -118,16 +118,17 @@
 	import { onMounted, onUnmounted, ref, onBeforeUnmount } from 'vue'
 	import { clothesRentUrl } from '../../../common/globalImagesUrl';
 	import { baseUrl } from '../../../api/request';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import emitter from '../../../utils/emitter';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
+	import { getFonts } from '../../../common/globalFont';
+	import { onLoad } from "@dcloudio/uni-app";
 	const items = ref([null, null, null, null])
 	const isShowUnderLine = ref([true, false, false, false, false])
 	let orderStatusList = ['全部', '待支付', '待发货', '待收货', '交易成功']
 	const color = ref(new Array(5).fill('#323232'))
 	const point = ref(0)
 	const cookie = wx.getStorageSync("cookie") //请求头
-	const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderList/bkg.png')
 	const orderList = ref([])
 	const tempOrderList = ref([])
 	
@@ -141,6 +142,10 @@
 		getRentOrderList()
 	}
 	
+	onLoad(()=>{
+		getFonts()
+	})
+	
 	onMounted(() => {
 		color.value[0] = '#e79ea1'
 		getRentOrderList()
@@ -542,14 +547,14 @@
 
 	.font {
 		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 28.24rpx;
 		color: #323232;
 	}
 
 	.font_2 {
 		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 28.84rpx;
 		color: #323232;
 	}
@@ -582,14 +587,14 @@
 
 	.font_3 {
 		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 28.01rpx;
 		color: #323232;
 	}
 
 	.font_4 {
 		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 18.79rpx;
 		color: #ffaaa5;
 	}
@@ -600,7 +605,7 @@
 
 	.font_5 {
 		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 25.84rpx;
 		color: #ffaaa5;
 	}
@@ -615,14 +620,14 @@
 
 	.font_6 {
 		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 25.84rpx;
 		color: #818181;
 	}
 
 	.font_7 {
 		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 18.79rpx;
 		color: #818181;
 	}
@@ -655,14 +660,14 @@
 
 	.font_8 {
 		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 29.18rpx;
 		color: #323232;
 	}
 
 	.font_10 {
 		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 18.79rpx;
 		color: #323232;
 	}
@@ -685,7 +690,7 @@
 
 	.font_9 {
 		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 25.84rpx;
 		color: #323232;
 	}
@@ -705,7 +710,7 @@
 
 	.font_11 {
 		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 18.79rpx;
 		color: #323232;
 	}
@@ -725,7 +730,7 @@
 
 	.font_12 {
 		font-size: 33.75rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 22.54rpx;
 		color: #c35c5d;
 	}
@@ -738,7 +743,7 @@
 
 	.font_13 {
 		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 25.84rpx;
 		color: #e79ea1;
 	}
@@ -769,7 +774,7 @@
 
 	.font_14 {
 		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 25.84rpx;
 		color: #ffffff;
 	}

pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}">
 	  <view class="flex-row items-center section_2 pos">
 	    <image
 	      class="image"
@@ -100,13 +100,14 @@
 <script setup>
 	import {ref,onMounted, onUnmounted, onBeforeUnmount} from 'vue'
 	import { onLoad } from "@dcloudio/uni-app";
-	import { clothesRentUrl } from '../../../common/globalImagesUrl';
+	import { clothesRentUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { clothesRentOrderMap } from '../../../common/global';
 	import { baseUrl } from '../../../api/request';
 	import { publicPath } from '../../../common/globalImagesUrl';
+import { getFonts } from '../../../common/globalFont';
+
 	import emitter from '../../../utils/emitter';
 	const cookie = wx.getStorageSync('cookie')
-	const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
 	const rentOrderDetail = ref({})    //租赁订单详情
 	const contactsSnapshot = ref({})   //联系人快照
 	const clothesSnapshot = ref({})    //服装快照
@@ -124,6 +125,7 @@
 	
 	onLoad((options)=>{
 		getOrderDetail(options.id)
+		getFonts()
 	})
 	
 	const getOrderDetail = async (val) => {
@@ -386,7 +388,7 @@ button::after{
 }
 .font {
   font-size: 28.13rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 26.47rpx;
   color: #818181;
 }
@@ -397,7 +399,7 @@ button::after{
 .text_2 {
   color: #6b6e72;
   font-size: 24.38rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 24rpx;
 }
 .section_3 {
@@ -443,7 +445,7 @@ button::after{
 }
 .font_2 {
   font-size: 28.13rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 26.47rpx;
   color: #323232;
 }
@@ -453,7 +455,7 @@ button::after{
 }
 .font_3 {
   font-size: 28.13rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 19.41rpx;
   color: #323232;
 }
@@ -484,7 +486,7 @@ button::after{
 .text_10 {
   color: #c35c5d;
   font-size: 33.75rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 22.54rpx;
 }
 .group_4 {

pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')'}">
 	  <view class="flex-row justify-between items-center section_2 pos" @click="openPopup">
 	    <view class="flex-row items-center">
 	      <image
@@ -72,11 +72,11 @@
 	import { clothesRentUrl } from '../../../common/globalImagesUrl';
 	import { onLoad } from "@dcloudio/uni-app";
 	import { baseUrl } from '../../../api/request';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import emitter from '../../../utils/emitter';
 	import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
 	import contactsComponentVue from '../../order/component/contactsComponent.vue';
-	const bkgUrl = ref(clothesRentUrl + '/clothesRentSubmitOrder/bkg.png')
+import { getFonts } from '../../../common/globalFont';
 	const period = ref(0)
 	let id = 0
 	const clothesInfo = ref({})
@@ -125,6 +125,7 @@
 	onLoad((options) => {
 		id = JSON.parse(options.id)
 		period.value = JSON.parse(options.period)
+		getFonts()
 	})
 	
 	onMounted(() => {
@@ -359,7 +360,7 @@
 }
 .font {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 28.84rpx;
   color: #323232;
 }
@@ -369,7 +370,7 @@
 }
 .font_2 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 25.54rpx;
 }
 .text_2 {
@@ -404,7 +405,7 @@
 }
 .font_3 {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 20.04rpx;
   color: #323232;
 }
@@ -434,7 +435,7 @@
 .text_7 {
   color: #c35c5d;
   font-size: 33.75rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 22.54rpx;
 }
 .section_4 {
@@ -449,7 +450,7 @@
 }
 .font_4 {
   font-size: 37.5rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
 }
 .text_8 {
   color: #323232;

pages/coupon/CouponMall/CouponMall.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
 	  
 	  <view class="my-box">
 		<view class="flex-col justify-start items-center text-wrapper pos"><text class="font text">积分商城</text></view>
@@ -51,7 +51,7 @@
 	import { baseUrl } from '@/api/request';
 	import confirmPopupVue from '../component/confirmPopup.vue';
 	import emitter from '../../../utils/emitter';
-	import { couponUrl } from '../../../common/globalImagesUrl';
+	import { couponUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { onLoad } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
 	onLoad(() => {

pages/coupon/CouponTips/CouponTips.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></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">
 	    <text class="self-start font_2">积分怎么花？</text>
@@ -23,9 +23,8 @@
 <script setup lang="ts">
 	import { onLoad } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
-	import { couponUrl } from "../../../common/globalImagesUrl";
+	import { couponUrl,bkgPubilcPath } from "../../../common/globalImagesUrl";
-	import {ref} from 'vue'
+	import {ref} from 'vue';
-	const bkgUrl = ref(couponUrl + '/CouponTips/bkg.png')
 	onLoad(() => {
 		getFonts()
 	})

pages/coupon/MyCoupon/MyCoupon.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></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>
 	  <view class="flex-col pos_3">
@@ -31,9 +31,8 @@
 	import { baseUrl } from '../../../api/request';
 	import { onShow, onLoad } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
-	import { couponUrl } from '../../../common/globalImagesUrl';
+	import { bkgPubilcPath } from '../../../common/globalImagesUrl';
 	const cookie = wx.getStorageSync("cookie")  //请求头
-	const bkgUrl = ref(couponUrl + '/MyCoupon/bkg.png')
 	onLoad(() => {
 		getFonts()
 	})

pages/coupon/OverDueCoupon/OverDueCoupon.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="shrink-0 section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></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>
 	  <view class="flex-col pos_3">
@@ -30,8 +30,7 @@
 	import { baseUrl } from '../../../api/request';
 	import { onLoad } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
-	import { couponUrl } from '../../../common/globalImagesUrl';
+	import { bkgPubilcPath } from '../../../common/globalImagesUrl';
-	const bkgUrl = ref(couponUrl + '/OverDueCoupon/bkg.png')
 	onLoad(() => {
 		getFonts()
 	})

pages/home/home.vue

@@ -1,6 +1,6 @@
 <template>
-<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
   <image class="image pos" :src="homeUrl + '/flower.png'" />
   <text class="text pos_6">限定手制|非量售卖</text>
   <text class="font pos_2">匠</text>
@@ -56,7 +56,7 @@ import { baseUrl, testUrl , suiUrl} from '@/api/request';
 import { onShow,onLoad } from "@dcloudio/uni-app";
 import { getFonts } from '../../common/globalFont';
 import { getZSFont } from '../../common/globalFont';
-import { homeUrl } from '../../common/globalImagesUrl';
+import { homeUrl,bkgPubilcPath } from '../../common/globalImagesUrl';
 const bkgUrl = ref(homeUrl + '/bkg.png')
 onShow(() => {
 	uni.removeStorageSync('businessId')
@@ -76,15 +76,15 @@ const getMyUser = async () =>{
 		}
 	})
 	console.log('获取用户信息==>',res.data)
-	if( res.data.code === 40100 ) {
+	// if( res.data.code === 40100 ) {
-		uni.navigateTo({
+	// 	uni.navigateTo({
-			url: '/pages/login/login'
+	// 		url: '/pages/login/login'
-		})
+	// 	})
-		uni.showToast({
+	// 	uni.showToast({
-			icon: 'loading',
+	// 		icon: 'loading',
-			title: "请登录"
+	// 		title: "请登录"
-		})
+	// 	})
-	}
+	// }
 }
 const jump_xiezhen =()=>{  //跳转写真预约
 	uni.navigateTo({
@@ -149,7 +149,7 @@ const showStop =()=>{
 .text {
   color: #C35C5D;
   font-size: 37.5rpx;
-  font-family: FangZhengFonts;
+  font-family: 'FangZhengFonts';
   line-height: 36.92rpx;
 }
 .pos_6 {
@@ -214,7 +214,7 @@ const showStop =()=>{
 }
 .font_2 {
   font-size: 28.13rpx;
-  font-family: FangZhengFonts;
+  font-family: 'FangZhengFonts';
   line-height: 26.47rpx;
   color: #323232;
 }
@@ -247,7 +247,7 @@ const showStop =()=>{
 }
 .font_3 {
   font-size: 18.75rpx;
-  font-family: FangZhengFonts;
+  font-family: 'FangZhengFonts';
   line-height: 17.29rpx;
   color: #faddde;
 }

pages/login/login.vue

@@ -24,10 +24,14 @@ import { baseUrl, testUrl , suiUrl} from '@/api/request';
 import { onMounted } from 'vue';
 import { onLoad } from "@dcloudio/uni-app";
 import { getFonts } from '../../common/globalFont';
-import { loginUrl } from '../../common/globalImagesUrl';
+import { loginUrl, bkgPubilcPath } from '../../common/globalImagesUrl';
 import { getFZXZFont } from '../../common/globalFont';
 import { getZSFont } from '../../common/globalFont';
 const bkgUrl = ref(loginUrl + '/bkg.png')
+
+onMounted(()=>{
+})
+
 onLoad(() => {
 	getFonts()
 	getFZXZFont()
@@ -55,7 +59,7 @@ const loginUser = async ( code ) =>{
 			code: code
 		}  
 	})
-	console.log('loginUser后台返回的==>',res.header['Set-Cookie']);
+	// console.log('loginUser后台返回的==>',res.header['Set-Cookie']);
 	uni.removeStorageSync('cookie'); 
 	uni.setStorageSync("cookie",res.header['Set-Cookie']);  //保存setStorageSync到
 	if(res.data.code == 1) {

pages/mine/Contact/testContact.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 		<view class="flex-col section">
 			<view class="flex-col justify-start items-center text-wrapper"><text class="text">联系人列表</text></view>
 			<view class="mt-10 flex-col list">
@@ -42,8 +42,7 @@
 	import { getFonts } from '../../../common/globalFont';
 	import emitter from '../../../utils/emitter';
 	import contactPopVue from '../component/contactPop.vue'; //导入联系人弹窗
-	import { mineUrl } from '../../../common/globalImagesUrl';
+	import { mineUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
-	const bkgUrl = ref(mineUrl + '/Contact/bkg.png')
 	onLoad(() => {
 		getFonts()
 	})

pages/mine/addressList/addressList.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 	  <view class="flex-col list">
 	    <view class="flex-col list-item mt-10" v-for="(item, index) in addressArr" :key="index">
 	      <view class="flex-row justify-between items-center">
@@ -40,9 +40,8 @@ import { ref, onMounted } from 'vue'
 import { baseUrl } from '../../../api/request';
 import { onShow, onLoad } from '@dcloudio/uni-app';
 import { getFonts } from '../../../common/globalFont';
-import { mineUrl } from '../../../common/globalImagesUrl';
+import { mineUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 const addressArr = ref([])  //地址数组
-const bkgUrl = ref(mineUrl + '/addressList/bkg.png')
 onLoad(() => {
 	getFonts()  
 })

pages/mine/component/contactPop.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 添加联系人页面 -->
-<view class="flex-row relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+<view class="flex-row relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
   <text class="text pos_2">{{ templateString }}</text>
   <image class="image pos" :src="mineUrl + '/component/cha.png'" @click="closePop()"/>
   <view class="flex-col section_2 pos_3">
@@ -29,7 +29,7 @@ import { testUrl , baseUrl , suiUrl } from '../../../api/request';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { getFonts } from '../../../common/globalFont';
 import emitter from '../../../utils/emitter';
-import { mineUrl } from '../../../common/globalImagesUrl';
+import { mineUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 import { JudgeIsNullity } from '../../../common/globalFunction';
 onLoad(() => {
 	getFonts()

pages/mine/main/main.vue

@@ -1,12 +1,12 @@
 <template>
-	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 
 		<image class="imgPos_1" :src="mineUrl + '/main/mh.png'" />
 		<image class="imgPos_2" :src="mineUrl + '/main/hb.png'" />
 
 		<view class="flex-col group">
 			<view class="flex-row items-center group_2">
-				<button class="avatar_button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+				<button class="avatar_button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" >
 					<image class="avatar_son" mode="aspectFill" :src="publicPath + myAvatar" />
 				</button>
 
@@ -15,7 +15,7 @@
 					<!-- <text class="text">微信用户</text> -->
 
 					<input class="text" type="nickname" v-model="nickName" placeholder="请输入昵称" name="nickname"
-						@blur="onUpdateNick" maxlength="10"/>
+						@blur="onUpdateNick" maxlength="10" :disabled="disabledInput"/>
 					<text class="mt-18 font text_2">剩余积分：{{ myPoints }}</text>
 				</view>
 			</view>
@@ -73,24 +73,6 @@
 					<view class="divider pos_4"></view>
 				</view>
 			</view>
-
-			<!-- <view class="flex-row justify-between group_4" @click="jumpToBookingOrder">
-				<view class="flex-row items-center">
-					<image class="shrink-0 image_8" :src="mineUrl + '/main/wdyy.png'" />
-					<text class="font_2 text_9">我 的 预 约</text>
-				</view>
-				<image class="self-start image_4 image_9" :src="mineUrl + '/main/yjt.png'" />
-				<view class="divider pos_99"></view>
-			</view>
-			
-			<view class="flex-row justify-between group_4" @click="jumpToBookingOrder">
-				<view class="flex-row items-center">
-					<image class="shrink-0 image_8" :src="mineUrl + '/main/rent.png'" />
-					<text class="font_2 text_9">我 的 租 赁</text>
-				</view>
-				<image class="self-start image_4 image_9" :src="mineUrl + '/main/yjt.png'" />
-			</view> -->
-
 			<view class="flex-col group_5">
 				<!-- <view class="divider view"></view> -->
 				<view class="flex-row justify-between items-center group_6" @click="jumpToMyCoupon">
@@ -103,7 +85,7 @@
 
 				<view class="divider view_2"></view>
 
-				<view class="flex-row justify-between group_7" @click="userLogout">
+				<view class="flex-row justify-between group_7" @click="userLogout" v-if="nickName != '未登录'">
 					<view class="flex-row self-center">
 						<view class="flex-row shrink-0">
 							<image class="shrink-0 image_12" :src="mineUrl + '/main/logout.png'" />
@@ -129,12 +111,10 @@
 	import { baseUrl } from '../../../api/request';
 	import { getFonts } from '../../../common/globalFont';
 	import { mineUrl } from '../../../common/globalImagesUrl';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
 	import { JudgeIsNullity } from '../../../common/globalFunction';
 
-	const bkgUrl = ref(mineUrl + '/main/bkg.png')
-
 	onPullDownRefresh(async () => { //下拉刷新
 		await getMyUser()
 		setTimeout(() => {
@@ -224,6 +204,12 @@
 	let tempFile = ''
 	const myAvatar = ref(mineUrl + '/main/avatar.png')
 	const onChooseAvatar = (e) => {
+		if(nickName.value === '未登录') {
+			uni.redirectTo({
+				url: '/pages/login/login'
+			})
+			return;
+		}
 		tempFile = e.detail.avatarUrl
 		console.log(tempFile)
 		uni.uploadFile({
@@ -249,6 +235,12 @@
 
 	const nickName = ref('非遗雅士')
 	const onUpdateNick = (e) => {
+		if(nickName.value === '未登录') {
+			uni.navigateTo({
+				url: '/pages/login/login'
+			})
+			return;
+		}
 		if (JudgeIsNullity(nickName.value)) {
 			getMyUser()
 			uni.showModal({
@@ -278,6 +270,7 @@
 		console.log(res.data.data)
 	}
 	
+	const disabledInput = ref(true)
 	const myPoints = ref(0)
 	const getMyUser = async () => {
 		const res = await uni.request({
@@ -287,11 +280,20 @@
 				cookie
 			}
 		})
-		console.log(res.data.data)
+		console.log('登陆状态--->',res.data)
+		if(res.data.code === 40100) {
+			nickName.value = '未登录'
+			uni.showToast({
+				icon: 'fail',
+				title: '未登录'
+			})
+		} else if(res.data.code === 1) {
+			disabledInput.value = false
 			nickName.value = res.data.data.userName
 			myAvatar.value = res.data.data.userAvatar
 			myPoints.value = res.data.data.points
 		}
+	}
 </script>
 
 <style lang="scss" scoped>

pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
 	  <view class="flex-row section_2 pos">
 	    <image
 	      class="self-center image"
@@ -135,9 +135,8 @@
 	import { getFonts } from '../../../common/globalFont';
 	import emitter from '../../../utils/emitter';
 	import { myOrderUrl } from '../../../common/globalImagesUrl.js';
-	import { publicPath } from '../../../common/globalImagesUrl.js';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl.js';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
-	const bkgUrl = ref(myOrderUrl + '/myGeneralOrderDetail/bkg.png')
 	const order = ref({})
 	const cookie = wx.getStorageSync('cookie')
 	let orderId = ''

pages/my-order/myOrderList/myOrderList.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start items-center relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start items-center relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 	<!--  <image
 	    class="image_3"
 	    src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=666fe70fbe2b3eb6bec964adf12deccc.png"
@@ -131,7 +131,7 @@
 	import navVue from '../component/nav.vue';
 	import emitter from '../../../utils/emitter';
 	import { getFonts } from '../../../common/globalFont';
-	import { myOrderUrl } from '../../../common/globalImagesUrl';
+	import { myOrderUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { publicPath } from '../../../common/globalImagesUrl';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
 	const color = ref(new Array(5).fill('#323232'))
@@ -150,7 +150,6 @@
 	let loading = false;
 	let isLoading = ref(false)
 	let isShow = ref(false)
-	const bkgUrl = ref(myOrderUrl + '/myOrderList/bkg.png')
 	
 	const flushOrderListHandler = () => {
 		getMyOrder()

pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
 	  <view class="flex-row items-center section_2 pos">
 	    <image
 	      class="image"
@@ -117,9 +117,8 @@
 	import emitter from '../../../utils/emitter';
 	import { getFonts } from '../../../common/globalFont';
 	import { myOrderUrl } from '../../../common/globalImagesUrl';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
-	const bkgUrl = ref(myOrderUrl + '/myOrderList/bkg.png')
 	const cookie = wx.getStorageSync('cookie')
 	let orderId = ''
 	const order = ref({})

pages/my-order/researchOrder/researchOrder.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 	  <!-- <view class="section"></view> -->
 	  <view class="flex-col justify-start section_2 pos">
 	    <view class="flex-row section_3" style="display: flex; align-items: center;">
@@ -17,8 +17,7 @@
 	import {ref} from 'vue'
 	import { onLoad } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
-	import { myOrderUrl } from '../../../common/globalImagesUrl';
+	import { myOrderUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
-	const bkgUrl = ref(myOrderUrl + '/photoProductDetail/bkg.png')
 	onLoad(() => {
 		getFonts()
 	})

pages/order/product-waitpay/product-waitpay.vue

@@ -1,5 +1,5 @@
 <template>
-<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
   <view class="flex-col group_1">
 		<!-- 地址信息 -->
 	<view @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
@@ -128,8 +128,7 @@ import * as math from 'mathjs'
 import { dealResult } from '../../../common/globalFunction';
 import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue';
 import { orderUrl } from '../../../common/globalImagesUrl';
-import { publicPath } from '../../../common/globalImagesUrl';
+import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
-const bkgUrl = ref(orderUrl + '/product-waitpay/bkg.png')
 //一些暂时变量
 const sumprice = ref(0) //总价格
 //11.4开发 不应该删掉的

pages/order/serviceWaitPay/serviceWaitPay.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 批量服务类商品购买 -->
-	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 	  <view class="flex-row justify-between items-center section_2">
 	    <view class="flex-row items-center">
 	      <image
@@ -152,8 +152,7 @@
 	import * as math from 'mathjs'
 	import { dealResult } from '../../../common/globalFunction';
 	import { orderUrl } from '../../../common/globalImagesUrl';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
-	const bkgUrl = ref(orderUrl + '/serviceWaitPay/bkg.png')
 	//一些暂时变量
 	const sumprice = ref(0) //总价格
 	const popup = ref(null) //弹窗对象

pages/order/singleGoodOrder/singleGoodOrder.vue

@@ -1,6 +1,6 @@
 <!-- 单个商品购买页面 -->
 <template>
-<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
   <view class="flex-col group_1">
 		<!-- 地址信息 -->
 	<view @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
@@ -134,8 +134,7 @@ import * as math from 'mathjs'
 import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
 import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue';
 import { orderUrl } from '../../../common/globalImagesUrl';
-import { publicPath } from '../../../common/globalImagesUrl';
+import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
-const bkgUrl = ref(orderUrl + '/singleGoodOrder/bkg.png')
 //一些暂时变量
 const sumprice = ref(0) //总价格
 //11.4开发 不应该删掉的

pages/order/singleServiceWait/singleServiceWait.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 批量服务类商品购买 -->
-	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 	  <view class="flex-row justify-between items-center section_2" @click="loadPop" >
 	    <view class="flex-row items-center">
 	      <image
@@ -150,8 +150,7 @@
 	import couponPopupVue from '../../coupon/component/couponPopup.vue';
 	import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
 	import { orderUrl } from '../../../common/globalImagesUrl';
-	import { publicPath } from '../../../common/globalImagesUrl';
+	import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
-	const bkgUrl = ref(orderUrl + '/singleServiceWait/bkg.png')
 	const sumprice = ref(0) //总价格
 	const popup = ref(null) //弹窗对象
 	const contactRealInfo = ref({}) //地址页  选择地址传过来的值  进入页面首先是默认地址，若无默认地址，则为空

pages/store-home/main/testMain.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-row relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-row relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 	  <view class="flex-row justify-between items-center section_2 pos">
 	    <!-- <text class="text" style="color: #E79EA1;">商品</text> -->
 	    <view class="flex-row items-center section_3" @click="goToSearch">
@@ -65,10 +65,8 @@ import { baseUrl, testUrl , suiUrl} from '@/api/request';
 import { onLoad,onPullDownRefresh } from '@dcloudio/uni-app';
 import { getFonts } from '../../../common/globalFont';
 import carousel from '@/components/vear-carousel/vear-carousel'
-import { workshopUrl } from '../../../common/globalImagesUrl';
-import { storeHomeUrl } from '../../../common/globalImagesUrl';
-import { publicPath } from '../../../common/globalImagesUrl';
 import { all } from 'mathjs';
+import { workshopUrl, bkgPubilcPath, storeHomeUrl, publicPath } from '../../../common/globalImagesUrl';
 const bkgUrl = ref(storeHomeUrl + '/main/bkg.png')
 const currentColor = ref(0);
 const sort = ref([{}]) //商品类别对象数组

pages/test/test.vue

@@ -1,302 +0,0 @@
-<template>
-<!-- 	<view style="width: 100%; background-color: gold; text-align: center;">
-		<text style="font-size: 50rpx;">先登录再查看物流</text>
-	</view>
-	<button @click="login" type="primary">登录</button>
-	<button @click="toDelieverPage" type="primary">查看物流</button>
-	<button @click="getToken" type="warn">获取token</button>
-	<button @click="toDelieverPage2" type="warn">查看物流</button>
-	<button @click="chooseAddress" type="primary">wx.chooseAddress</button>
-	<button @click="chooseLocation" type="primary">wx.chooseLocation</button>
-	<button @click="testMap" type="primary">导航到师大</button>
-	<button @click="userLogin" type="primary">测试登录</button>
-	<button @click="getWxLoginCode" type="warn">获取微信登录code</button>
-	 -->
-	
-	
-	
-	<!-- <button @click="getIdList" type="warn">获取运力id列表</button> -->
-</template>
-
-<script setup lang="ts">
-	import { onLoad } from  "@dcloudio/uni-app"; 
-	import { onMounted } from "vue";
-	import { baseUrl } from "../../api/request";
-	
-	let waybillToken = ''
-	let access_token = ''
-	
-	const getTime = () => {
-		const now = new Date();
-		const year = now.getFullYear();
-		const month = ('0' + (now.getMonth() + 1)).slice(-2);
-		const day = ('0' + now.getDate()).slice(-2);
-		const hours = ('0' + now.getHours()).slice(-2);
-		const minutes = ('0' + now.getMinutes()).slice(-2);
-		const seconds = ('0' + now.getSeconds()).slice(-2);
-		const formattedTime = year + '-' +  month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
-		console.log(formattedTime)
-	}
-
-	
-	const userLogin = () => {
-		uni.request({
-			url: testUrl + '/user/login',
-			method: 'POST',
-			data: {
-				userAccount: 'feiyi',
-				userPassword: 123456
-			},
-			success: (res) => {
-				console.log(res)
-			}
-		})
-	}
-	
-	// 	onMounted(() => {
-	// 		var interval = setInterval(() => {
-	// 			toDelieverPage()
-	// 			if (waybillToken == null) {
-	// 				getTime()
-	// 				clearInterval(interval)
-	// 			}
-	// 		}, 5000)
-	
-	// 	})
-	
-	// onMounted(() => {
-	// 	uni.request({
-	// 		url: baseUrl + '/logistics/get/token',
-	// 		method: 'GET',
-	// 		header: {
-	// 			'cookie': wx.getStorageSync("cookie")
-	// 		},
-	// 		success: (res:any) => {
-	// 			access_token = res.data.data.access_token
-	// 			console.log(res.data)
-	// 		}
-	// 	})
-	// })
-	
-	const getWxLoginCode = () => {
-		wx.login({
-			success: (res) => {
-				console.log(res.code)
-			}
-		})
-	}
-	
-
-	const testMap = () => {
-		
-		wx.openLocation({
-			latitude: 45.867741,
-			longitude: 126.560037,
-			name: '哈尔滨师范大学(松北校区)',
-			address: '黑龙江省哈尔滨市呼兰区利民经济开发区师大路1号',
-			success: (res) => {
-				console.log(res)
-			}
-		})
-	}
-	
-	
-	const map = () => {
-		let plugin2 = requirePlugin('routePlan');
-		let key = 'KJKBZ-477KC-7VX2S-AD5UK-RBBRZ-7IFFB';  //使用在腾讯位置服务申请的key
-		let referer = '泠珑水月阁文化艺术工作室';   //调用插件的app的名称
-		let endPoint = JSON.stringify({  //终点
-		  'name': '北京西站',
-		  'latitude': 39.894806,
-		  'longitude': 116.321592
-		});
-		wx.navigateTo({
-		  url: 'plugin://routePlan/index?key=' + key + '&referer=' + referer + '&endPoint=' + endPoint
-		});
-	}
-	
-	
-	const chooseAddress = () => {
-		wx.chooseAddress({
-			success: (res) => {
-				console.log(res)
-			}
-		})
-	}
-	
-	const chooseLocation = () => {
-		wx.chooseLocation({
-			latitude: 28.58,
-			longitude: 121.48,
-			success: (res) => {
-				console.log(res)
-			}
-		})
-	}
-	
-	
-	const getToken = () => {
-		uni.request({
-			url: 'https://api.weixin.qq.com/cgi-bin/token',
-			method: 'GET',
-			data: {
-				grant_type: 'client_credential',
-				appid: 'wx61b63e27bddf4ea2',
-				secret: '5ef9e1f17acd8180afe2d80199fd466e'
-			},
-			success: (res) => {
-				access_token = res.data.access_token
-				console.log(access_token)
-			}
-		})
-	}
-	
-	
-	
-	const toDelieverPage3 = () => {
-		uni.request({
-			url: 'https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/follow_waybill?access_token=' + access_token,
-			method: 'POST',
-			data: {
-			  openid:"oydCP7TGAWUqN_d0g3y6bbQkbe2I",
-			  waybill_id:"YT8949374567344",
-			  receiver_phone:"123456566",
-			  goods_info:{
-				detail_list:[
-				 {
-				   goods_name:"测试名字",
-				   goods_img_url:"https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FSnnMkwOn-1ab7a54755e0a23722c1b9dd0ae981c4.png"
-				 },
-				 {
-				   goods_name:"测试名字2",
-				   goods_img_url:"https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FSnnMkwOn-1ab7a54755e0a23722c1b9dd0ae981c4.png"
-				 }
-				]
-			  }
-			},
-			success: (res) => {
-				console.log(res.data)
-				waybillToken = res.data.waybill_token
-				plugin.openWaybillTracking({
-					waybillToken: waybillToken
-				})
-			}
-		})
-	}
-	
-	
-	const toDelieverPage2 = () => { 
-		uni.request({
-			url: 'https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/trace_waybill?access_token=' + access_token,
-			method: 'POST',
-			data: {
-			  openid:"oydCP7TGAWUqN_d0g3y6bbQkbe2I",
-			  waybill_id:"YT8949374567344",
-			  receiver_phone:"123456566",
-			  goods_info:{
-				detail_list:[
-				 {
-				   goods_name:"测试名字",
-				   goods_img_url:"https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FSnnMkwOn-1ab7a54755e0a23722c1b9dd0ae981c4.png"
-				 },
-				 {
-				   goods_name:"测试名字2",
-				   goods_img_url:"https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FSnnMkwOn-1ab7a54755e0a23722c1b9dd0ae981c4.png"
-				 }
-				]
-			  }
-			}, 
-			success: (res) => {
-				console.log(res.data)
-				waybillToken = res.data.waybill_token
-				plugin.openWaybillTracking({
-					waybillToken: waybillToken
-				})
-			}
-		})
-	}
-	
-	
-	var plugin = requirePlugin('logisticsPlugin')
-	const toDelieverPage = () => {
-		uni.request({
-			url: baseUrl + '/logistics/get/info',
-			method: 'POST',
-			data: {
-				id: 125125278
-			},
-			header: {
-				'cookie': wx.getStorageSync("cookie")
-			},
-			success: (res) => {
-				console.log(res.data.data)
-				waybillToken = res.data.data.waybill_token
-				plugin.openWaybillTracking({
-					waybillToken: waybillToken
-				})
-			}
-		})
-	}
-	
-	
-	const getIdList = () => {
-		uni.request({
-			url: 'https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/get_delivery_list?access_token=' + access_token,
-			method: 'POST',
-			data: {
-				
-			},
-			success: (res) => {
-				console.log(res.data)
-			}
-		})
-	}
-	
-	
-	const login = () => {
-		uni.login({
-			provider: 'weixin', //使用微信登录
-			success: function (loginRes) {
-				if (loginRes.code !== null) {
-					console.log("获取code:" + loginRes.code)
-					loginUser(loginRes.code);
-				} else {
-					console.log("code为空");
-				}
-			}
-		})
-	}
-	//非遗
-	const loginUser = async ( code ) =>{
-		const res = await uni.request({
-			url: baseUrl + '/user/login/wx_open',
-			method: 'GET',
-			data: {
-				code: code
-			}  
-		})
-		console.log(res)
-		console.log('loginUser后台返回的==>',res.header['Set-Cookie']);
-		uni.removeStorageSync('cookie'); 
-		uni.setStorageSync("cookie",res.header['Set-Cookie']);  //保存setStorageSync到
-		if(res.data.code == 1) {
-			uni.showToast({
-				title: '登录成功',
-				duration: 2000  //提示两秒
-			})
-			uni.setStorageSync('userInfo',res.data.data);
-		} else {
-			uni.showToast({
-				icon: 'error',
-				title: "登录失败，请重试"
-			})
-			return;
-		}
-	}
-	
-	
-</script>
-
-<style lang="scss" scoped>
-
-</style>

pages/testPage/testPage.vue

@@ -1,56 +0,0 @@
-<template>
-	
-	<!-- <clothesAttributeVue></clothesAttributeVue> -->
-	<customerServiceVue></customerServiceVue>
-</template>
-
-<script setup>
-import { onMounted } from 'vue';
-	// import clothesAttributeVue from '../clothesRent/component/clothesAttribute.vue';
-	import customerServiceVue from '../book/component/customerService.vue';
-	onMounted(() => {
-		getUrl()
-	})
-	
-	const getUrl = async () => {
-		const res = await uni.request({
-			url: 'http://123.249.108.160:8888/api/file/downloadFile',
-			method: 'GET',
-			data: {
-				objectKey: 'feiyi/test/2/ZFdyLLBg-VCG211334705187.png'
-			}
-		})
-		console.log(base64Data)
-		
-	}
-	// import { onMounted } from 'vue';
-	// import addressSelectedVue from '../Shopping-cart/component/addressSelected.vue';
-	
-	// onMounted(() => {
-	// 	console.log(Decode64(Encode64(`<p style="text-align: center;">富文本测试</p>`)))
-	// })
-	
-	
-	// /**
-	//   * 编码base64
-	//   */
-	// function Encode64(str) {
-	//   return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
-	//     function toSolidBytes(match, p1) {
-	//       return String.fromCharCode('0x' + p1);
-	//     }));
-	// }
-	// /**
-	// * 解码base64
-	// */
-	// function Decode64(str) {
-	//   return decodeURIComponent(atob(str).split('').map(function (c) {
-	//     return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-	//   }).join(''));
-	// }
-	
-</script>
-
-<style scoped lang="scss">
- 
-</style>

pages/workshop/component/timeSelect.vue

@@ -216,7 +216,7 @@
 		} else {
 			uni.showToast({
 				icon: 'error',
-				title: "服务错误"
+				title: res.data.message
 			})
 		}
 	}
@@ -335,7 +335,7 @@
 				quantity: cnt.value
 			}
 		})
-		console.log(res)
+		console.log('检查服务类商品---->',res)
 		if (!dealResult(res)) return ;
 		console.log('==============================>', productObject.value)
 		uni.navigateTo({  //跳转到待支付页面

pages/workshop/index/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
 	  <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">
 	      <image
@@ -48,12 +48,11 @@ import { baseUrl } from '../../../api/request';
 import { onLoad } from "@dcloudio/uni-app";
 import { getFonts } from '../../../common/globalFont';
 import { workshopUrl } from '../../../common/globalImagesUrl';
-import { publicPath } from '../../../common/globalImagesUrl';
+import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 import { onPullDownRefresh } from '@dcloudio/uni-app';
 import carousel from '@/components/vear-carousel/vear-carousel'
 const products = ref()
 const cookie = wx.getStorageSync("cookie")
-const bkgUrl = ref(workshopUrl + '/index/bkg.png')
 const carouseList = ref([])  //轮播图
 const imgList = ref([])  //轮播图展示图
 

pages/workshop/productmain/productmain.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
 	  <view class="flex-col self-stretch section">
 	    <image
 	      class="image_3" mode="aspectFill"                                                                                                                            
@@ -79,14 +79,13 @@ import { baseUrl } from '../../../api/request';
 import { workshopUrl } from '../../../common/globalImagesUrl';
 import timeSelectVue from '../component/timeSelect.vue';
 import  emitter  from '../../../utils/emitter' //导入emitter传值组件
-import { publicPath } from '../../../common/globalImagesUrl';
+import { publicPath,bkgPubilcPath } from '../../../common/globalImagesUrl';
 const pid = ref(0) //商品id
 const cookie = wx.getStorageSync("cookie")  //请求头
 const productObject = ref({})
 const popup = ref(null) //弹窗对象
 const pObj = {}
 const appointmentDateVOList = ref([])
-const bkgUrl = ref(workshopUrl + '/productmain/bkg.png')
 
 const closeTimeDialogHandler = () => {
 	close()

pages/workshop/searchGood/searchGood.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
 	  <view class="flex-row justify-center section_2 pos">
 	    <view class="flex-row items-center section_3">
 	      <image
@@ -18,8 +18,7 @@
 	import {ref} from 'vue'
 	import { onLoad } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
-	import { workshopUrl } from '../../../common/globalImagesUrl';
+	import { workshopUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
-	const bkgUrl = ref(workshopUrl + '/searchGood/bkg.png')
 	const type = ref('')
 	const goodList = ref([])
 	onLoad((options) => {

pages/workshop/searchResult/searchResult.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"></view>
+	  <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
 	  <view class="flex-row justify-center section_2 pos">
 	    <view class="flex-row items-center section_3" @click="goToSearch">
 	      <image
@@ -31,13 +31,12 @@
 	import {ref, onUnmounted} from 'vue'
 	import { onLoad } from "@dcloudio/uni-app";
 	import { baseUrl } from '../../../api/request';
-	import { workshopUrl } from '../../../common/globalImagesUrl';
+	import { workshopUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { getFonts } from '../../../common/globalFont';
 	const cookie = wx.getStorageSync("cookie")
 	const keyword = ref('')
 	const type = ref(0)
 	const goodList = ref([])
-	const bkgUrl = ref(workshopUrl + '/searchResult/bkg.png')
 	onLoad((options) => {
 		getFonts()
 		keyword.value = options.keyword