From 5eada5a1e4c1c3f2dbce9113866ec5560d4969ad Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Mon, 17 Mar 2025 00:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/globalImagesUrl.js | 18 +++-
pages/Shopping-cart/component/addProduct.vue | 7 +-
.../component/addressSelected.vue | 9 +-
.../newaddress_Info/newaddress_Info.vue | 5 +-
.../Shopping-cart/productmain/productmain.vue | 5 +-
.../productmain/testproductmain.vue | 11 +--
pages/home/home.vue | 13 +--
pages/login/login.vue | 6 +-
pages/mine/Contact/Contact.vue | 7 +-
pages/mine/Contact/testContact.vue | 8 +-
pages/mine/addressList/addressList.vue | 7 +-
pages/mine/component/contactPop.vue | 6 +-
pages/mine/main/hb.png | Bin 276486 -> 0 bytes
pages/mine/main/main.vue | 41 +++++----
pages/mine/main/mh.png | Bin 678833 -> 0 bytes
.../myGeneralOrderDetail.vue | 2 +-
pages/my-order/myOrderList/myOrderList.vue | 2 +-
.../myServiceOrderDetail.vue | 2 +-
.../my-order/researchOrder/researchOrder.vue | 2 +-
pages/order/component/addressComponent.vue | 9 +-
pages/order/component/contactsComponent.vue | 8 +-
.../order/product-waitpay/product-waitpay.vue | 9 +-
pages/order/serviceWaitPay/serviceWaitPay.vue | 17 ++--
.../order/singleGoodOrder/singleGoodOrder.vue | 17 ++--
.../singleServiceWait/singleServiceWait.vue | 7 +-
pages/popup.vue | 84 ------------------
.../ProductDetails/ProductDetails.vue | 8 +-
pages/store-home/main/testMain.vue | 11 +--
pages/workshop/index/index.vue | 13 +--
pages/workshop/productmain/productmain.vue | 5 +-
pages/workshop/searchGood/searchGood.vue | 4 +-
pages/workshop/searchResult/searchResult.vue | 4 +-
32 files changed, 145 insertions(+), 202 deletions(-)
delete mode 100644 pages/mine/main/hb.png
delete mode 100644 pages/mine/main/mh.png
delete mode 100644 pages/popup.vue
diff --git a/common/globalImagesUrl.js b/common/globalImagesUrl.js
index c477592..e16b462 100644
--- a/common/globalImagesUrl.js
+++ b/common/globalImagesUrl.js
@@ -1,4 +1,14 @@
-export const bookUrl = 'http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/book'
-export const couponUrl = 'http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/coupon'
-export const workshopUrl = 'http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop'
-export const myOrderUrl = 'http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/my-order'
\ No newline at end of file
+const publicPath = 'https://123.249.108.160:8888/api/file/downloadFile?objectKey='
+
+const subPath = 'feiyi/miniProgram'
+
+export const bookUrl = publicPath + subPath + '/book'
+export const couponUrl = publicPath + subPath + '/coupon'
+export const workshopUrl = publicPath + subPath + '/workshop'
+export const myOrderUrl = publicPath + subPath + '/my-order'
+export const shoppingCartUrl = publicPath + subPath + '/Shopping-cart'
+export const homeUrl = publicPath + subPath + '/home'
+export const loginUrl = publicPath + subPath + '/login'
+export const orderUrl = publicPath + subPath + '/order'
+export const storeHomeUrl = publicPath + subPath + '/store-home'
+export const mineUrl = publicPath + subPath + '/mine'
\ No newline at end of file
diff --git a/pages/Shopping-cart/component/addProduct.vue b/pages/Shopping-cart/component/addProduct.vue
index 2392c57..b435209 100644
--- a/pages/Shopping-cart/component/addProduct.vue
+++ b/pages/Shopping-cart/component/addProduct.vue
@@ -17,19 +17,19 @@
{{ quantity }}
@@ -47,6 +47,7 @@
ref
} from 'vue';
import emitter from '../../../utils/emitter';
+ import { shoppingCartUrl } from '../../../common/globalImagesUrl';
import {
onLoad,
onShow
diff --git a/pages/Shopping-cart/component/addressSelected.vue b/pages/Shopping-cart/component/addressSelected.vue
index 9d7c389..d3ad679 100644
--- a/pages/Shopping-cart/component/addressSelected.vue
+++ b/pages/Shopping-cart/component/addressSelected.vue
@@ -5,7 +5,7 @@
@@ -16,7 +16,7 @@
@@ -25,13 +25,13 @@
请选择收货地址
@@ -41,6 +41,7 @@
import {onMounted, onUnmounted, ref} from 'vue'
import emitter from '../../../utils/emitter';
import { JudgeIsNullity } from '../../../common/globalFunction';
+import { shoppingCartUrl } from '../../../common/globalImagesUrl';
const isShow = ref(false)
const addressInfo = ref({})
diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
index 531c896..618dba9 100644
--- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
+++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
@@ -22,7 +22,7 @@
@@ -54,6 +54,7 @@ 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 emitter from '../../../utils/emitter';
const isSelected = ref(false)
const addressParam = ref({
@@ -179,7 +180,7 @@ const bindTimeChange = (e) => { //picker省市区选择
.page {
padding-top: 26.44rpx;
// background-color: #fffaf0;
- background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+ 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%;
width: 100%;
overflow-y: auto;
diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue
index 516b359..c1c27a1 100644
--- a/pages/Shopping-cart/productmain/productmain.vue
+++ b/pages/Shopping-cart/productmain/productmain.vue
@@ -42,7 +42,7 @@
@@ -50,7 +50,7 @@
@@ -136,6 +136,7 @@ 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) //全选
diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue
index d045e74..eec2d40 100644
--- a/pages/Shopping-cart/productmain/testproductmain.vue
+++ b/pages/Shopping-cart/productmain/testproductmain.vue
@@ -4,7 +4,7 @@
购物车
+ :src="shoppingCartUrl + '/productmain/ss.png'" />
{{ stateText.topBtn }}
@@ -42,7 +42,7 @@
@@ -51,7 +51,7 @@
class="font_6">{{ item.quantity }}
@@ -81,14 +81,14 @@
{{ item.quantity }}
@@ -127,6 +127,7 @@
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) //全选
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 08a6405..0f841c1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,7 +1,7 @@
-
+
限定手制|非量售卖
匠
承
@@ -11,7 +11,7 @@
写真预约
@@ -21,7 +21,7 @@
技艺体验
@@ -31,7 +31,7 @@
推荐商品
@@ -41,7 +41,7 @@
活动咨询
朴物良社，匠心手作
@@ -55,6 +55,7 @@ import {inject, ref} from 'vue'
import { baseUrl, testUrl , suiUrl} from '@/api/request';
import { onShow,onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../common/globalFont';
+import { homeUrl } from '../../common/globalImagesUrl';
onShow(() => {
uni.removeStorageSync('businessId')
getMyUser()
@@ -121,7 +122,7 @@ const showStop =()=>{
margin-left: 4.13rpx;
}
.page {
- background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+ background-image: url(https://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/home/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5ca6a22..a60e4ab 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -3,7 +3,7 @@
泠
@@ -24,7 +24,7 @@ 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';
onLoad(() => {
getFonts()
})
@@ -76,7 +76,7 @@ const loginUser = async ( code ) =>{
\ No newline at end of file
diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue
index 84a5691..562c414 100644
--- a/pages/store-home/ProductDetails/ProductDetails.vue
+++ b/pages/store-home/ProductDetails/ProductDetails.vue
@@ -21,7 +21,7 @@
{{ goodObject.festivalName }}限定
@@ -67,7 +67,7 @@
@@ -96,6 +96,7 @@ import { baseUrl } from '../../../api/request';
import emitter from '../../../utils/emitter'
import addProduct from '../../Shopping-cart/component/addProduct.vue';
import { dealResult } from '../../../common/globalFunction';
+import { storeHomeUrl } from '../../../common/globalImagesUrl';
const popup = ref(null) //弹窗对象
const goodObject = ref({}) //商品对象
const idInfo = ref(0) //发送到下一页的商品id
@@ -105,6 +106,7 @@ const imgArr = ref([]) //商品图片数组
const coupon = ref(0) //当前商品可用的优惠卷
const cookie = wx.getStorageSync('cookie')
const richTextcontent = ref('')
+
//转换上一页面传来的商品
onLoad((options) => {
getFonts()
@@ -219,7 +221,7 @@ button::after {
margin-left: 16.88rpx;
}
.page {
- background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+ background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/main/ProductDetail/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
height: 100%;
diff --git a/pages/store-home/main/testMain.vue b/pages/store-home/main/testMain.vue
index 321e23d..df3448b 100644
--- a/pages/store-home/main/testMain.vue
+++ b/pages/store-home/main/testMain.vue
@@ -71,6 +71,7 @@ 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';
const currentColor = ref(0);
const sort =ref([{}]) //商品类别对象数组
const headerList = ref([{}]) //类别标题和介绍
@@ -169,16 +170,16 @@ const goToProduct = (item) => {
const imgList = ref([{
- url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVZJcndFL-VCG211334705187.png',
+ url: storeHomeUrl + '/main/banner1.png',
id: 1
},{
- url: ' https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FplnBXSNq-VCG211345185434.png',
+ url: storeHomeUrl + '/main/banner2.png',
id: 2
},{
- url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FpWmCgSml-VCG21gic13424447.png',
+ url: storeHomeUrl + '/main/banner3.png',
id: 3
},{
- url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FbGthWnIG-VCG211247054746.png',
+ url: storeHomeUrl + '/main/banner4.png',
id: 4
},])
@@ -238,7 +239,7 @@ input {
}
.page {
background-color: #ffffff;
- background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+ 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-repeat: no-repeat;
height: 100vh;
diff --git a/pages/workshop/index/index.vue b/pages/workshop/index/index.vue
index f084f71..9bca89d 100644
--- a/pages/workshop/index/index.vue
+++ b/pages/workshop/index/index.vue
@@ -5,7 +5,7 @@
@@ -32,7 +32,7 @@
{{ item.price }}
@@ -47,6 +47,7 @@ import { ref , onMounted } from 'vue'
import { baseUrl } from '../../../api/request';
import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont';
+import { workshopUrl } from '../../../common/globalImagesUrl';
const products = ref()
const cookie = wx.getStorageSync("cookie")
import carousel from '@/components/vear-carousel/vear-carousel'
@@ -79,16 +80,16 @@ const jump_detail =(item,index)=>{
const imgList = ref([{
- url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVZJcndFL-VCG211334705187.png',
+ url: workshopUrl + '/index/banner1.png',
id: 1
},{
- url: ' https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FplnBXSNq-VCG211345185434.png',
+ url: workshopUrl + '/index/banner2.png',
id: 2
},{
- url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FpWmCgSml-VCG21gic13424447.png',
+ url: workshopUrl + '/index/banner3.png',
id: 3
},{
- url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FbGthWnIG-VCG211247054746.png',
+ url: workshopUrl + '/index/banner4.png',
id: 4
},])
diff --git a/pages/workshop/productmain/productmain.vue b/pages/workshop/productmain/productmain.vue
index 9de5e59..57357e7 100644
--- a/pages/workshop/productmain/productmain.vue
+++ b/pages/workshop/productmain/productmain.vue
@@ -43,7 +43,7 @@
客服
@@ -76,6 +76,7 @@ import { ref,onMounted, nextTick, onUnmounted } from 'vue'
import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont';
import { baseUrl } from '../../../api/request';
+import { workshopUrl } from '../../../common/globalImagesUrl';
import timeSelectVue from '../component/timeSelect.vue';
import emitter from '../../../utils/emitter' //导入emitter传值组件
const pid = ref(0) //商品id
@@ -216,7 +217,7 @@ const loadPopBook = ()=> {
}
.section {
padding-bottom: 41.25rpx;
- background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJULGLADX-feiyigongfang.png');
+ background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/productmain/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
}
diff --git a/pages/workshop/searchGood/searchGood.vue b/pages/workshop/searchGood/searchGood.vue
index bf47449..8d94cbf 100644
--- a/pages/workshop/searchGood/searchGood.vue
+++ b/pages/workshop/searchGood/searchGood.vue
@@ -55,7 +55,7 @@
margin-left: 16.88rpx;
}
.page {
- background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop/searchGood/bkg.png);
+ background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/searchGood/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
@@ -64,7 +64,7 @@
height: 100vh;
}
.section {
- background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop/searchGood/bkg.png);
+ background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/searchGood/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 750rpx;
diff --git a/pages/workshop/searchResult/searchResult.vue b/pages/workshop/searchResult/searchResult.vue
index e04ce31..0d50080 100644
--- a/pages/workshop/searchResult/searchResult.vue
+++ b/pages/workshop/searchResult/searchResult.vue
@@ -149,7 +149,7 @@
margin-top: 9.38rpx;
}
.page {
- background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop/searchResult/bkg.png);
+ background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/searchResult/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
@@ -158,7 +158,7 @@
height: 100vh;
}
.section {
- background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop/searchResult/bkg.png);
+ background-image: url(http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop/searchResult/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 750rpx;