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 @@