diff --git a/api/request.ts b/api/request.ts index e4616ea..07f68f1 100644 --- a/api/request.ts +++ b/api/request.ts @@ -6,4 +6,4 @@ export const domain = 'https://www.carboner.cn:8888/api' export const myIp = 'http://8.130.119.119:9092/api' export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api' export const suiUrl = '' -export const baseUrl = domain +export const baseUrl = Url diff --git a/common/globalFunction.js b/common/globalFunction.js index 1f14631..89e7e4d 100644 --- a/common/globalFunction.js +++ b/common/globalFunction.js @@ -20,6 +20,14 @@ export const dealResult = (res) => { } +export const showTips = (msg) => { + uni.showToast({ + title: msg, + icon: 'success' + }) +} + + export const JudgeIsNullity = (val) => { if (val === null || val === undefined || val === '') return true return false diff --git a/pages/Shopping-cart/component/addProduct.vue b/pages/Shopping-cart/component/addProduct.vue index 31a48b9..4eb9bdf 100644 --- a/pages/Shopping-cart/component/addProduct.vue +++ b/pages/Shopping-cart/component/addProduct.vue @@ -201,14 +201,14 @@ } .text_3 { - color: #000000; + color: #323232; font-size: 28.13rpx; font-family: FangZhengFonts; line-height: 26.21rpx; } .text_4 { - color: #000000; + color: #323232; font-size: 26.25rpx; font-family: FangZhengFonts; line-height: 24.34rpx; @@ -240,7 +240,7 @@ } .text_5 { - color: #000000; + color: #323232; font-size: 30rpx; font-family: FangZhengFonts; line-height: 21.41rpx; diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue index effd5a2..5245484 100644 --- a/pages/Shopping-cart/productmain/testproductmain.vue +++ b/pages/Shopping-cart/productmain/testproductmain.vue @@ -101,11 +101,7 @@ - - + 全选 @@ -130,7 +126,7 @@ import * as math from 'mathjs' import { shoppingCartUrl,bkgPubilcPath } from '../../../common/globalImagesUrl'; import { publicPath } from '../../../common/globalImagesUrl'; -import { JudgeIsNullity } from '../../../common/globalFunction'; + import { JudgeIsNullity } from '../../../common/globalFunction'; const products = ref([]) const tempProducts = ref([]) const isShowInput = ref(false) @@ -652,6 +648,7 @@ import { JudgeIsNullity } from '../../../common/globalFunction';