Merge branch 'dev' into 'master'

uniapp【修复】：修改分销订单页面文字对应错误 See merge request jianweie/coreshoppro!71
2024-11-06 01:45:39 +00:00
parent f23079a2c5 fb69bce530
commit 991dbd8efd
54 changed files with 133 additions and 130 deletions
@@ -16,8 +16,8 @@
 	import { handleAdvertiseDetail } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		code ?: string,
+		code : string,
-		height ?: string
+		height : string
 	}>(), {
 		code: '',
 		height: '200rpx'
@@ -18,7 +18,7 @@
 	import { handleStaticResources } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -10,11 +10,11 @@
 	const emits = defineEmits(['onClick']);
 	const props = withDefaults(defineProps<{
-		title ?: string;
+		title : string;
 		radius ?: number;
 		backgroundColor ?: string;
 		color ?: string;
-		loading ?: boolean;
+		loading : boolean;
 		customStyle ?: { [key : string] : any }
 	}>(), {
 		title: '保存',
@@ -8,9 +8,9 @@
 	import { cdnFilesUrl } from '@/core/consts';
 	const props = withDefaults(defineProps<{
-		mode ?: EmptyEnum;
+		mode : EmptyEnum;
-		text ?: string;
+		text : string;
-		textColor ?: string;
+		textColor : string;
 	}>(), {
 		mode: EmptyEnum.data,
 		text: '数据为空',
@@ -1,5 +1,5 @@
 <template>
-	<view :class="props.type == 'horizontal' ? 'horizontal-good-card-box' : 'vertical-good-card-box'" >
+	<view :class="props.type == 'horizontal' ? 'horizontal-good-card-box' : 'vertical-good-card-box'">
 		<view class="img-box" :style="{ 'width': props.imgWidth, 'height': props.imgHeight }" @click="hanldeClickGoods">
 			<image class="good-img" :src="props.goodsData.image"></image>
 			<view class="recommend" v-if="props.goodsData.isRecommend">推荐</view>
@@ -38,12 +38,12 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		type ?: 'vertical' | 'horizontal',
+		type : 'vertical' | 'horizontal',
-		imgWidth ?: string,
+		imgWidth : string,
-		imgHeight ?: string,
+		imgHeight : string,
-		nameOverflow ?: number,
+		nameOverflow : number,
-		briefOverflow ?: number,
+		briefOverflow : number,
-		goodsData ?: any,
+		goodsData : any,
 	}>(), {
 		type: 'horizontal',  // vertical 垂直   horizontal 水平
 		imgWidth: '190rpx',
@@ -69,8 +69,8 @@
 	const userInfoStore = useUserInfoStore();
 	const props = withDefaults(defineProps<{
-		show ?: boolean,
+		show : boolean,
-		goodsDetailData ?: any,
+		goodsDetailData : any,
 	}>(), {
 		show: false,
 		goodsDetailData: {},
@@ -27,9 +27,10 @@
 		isShowStatusBarHeight ?: boolean;
 		customStyle ?: any;
 		contentStyle ?: any;
-		handleCustomRouteJump ?: () => void | null,
+		handleCustomRouteJump ?: () => void,
 		showLoginModalDom ?: boolean;
 		placeholder ?: boolean;
 	}>(), {
 		isBack: true,
 		bgColor: '#eef2f6',
@@ -39,7 +40,6 @@
 		isShowStatusBarHeight: true,
 		customStyle: {},
 		contentStyle: {},
 		handleCustomRouteJump: null,
 		showLoginModalDom: false,
 		placeholder: true,
 	});
@@ -28,7 +28,7 @@
 		isShowStatusBarHeight ?: boolean;
 		customStyle ?: any;
 		contentStyle ?: any;
-		handleCustomRouteJump ?: () => void | null,
+		handleCustomRouteJump ?: () => void,
 		showLoginModalDom ?: boolean;
 		needSkeleton ?: boolean;
 		skeleton ?: Array<{ [key : string] : any }>;
@@ -40,6 +40,7 @@
 		loadingTextFontSize ?: string;
 		loadingBgColor ?: string;
 		loadingColor ?: string;
 	}>(), {
 		isBack: true,
 		bgColor: '#eef2f6',
@@ -49,7 +50,6 @@
 		isShowStatusBarHeight: true,
 		customStyle: {},
 		contentStyle: {},
 		handleCustomRouteJump: null,
 		showLoginModalDom: false,
 		needSkeleton: false,
 		skeleton: [],
@@ -8,9 +8,9 @@
 	import { queryAreas } from '@/core/api';
 	const props = withDefaults(defineProps<{
-		show ?: boolean,
+		show : boolean,
-		cityList ?: Array<CityAddressType>,
+		cityList : Array<CityAddressType>,
-		pickerValue ?: string,
+		pickerValue : string,
 	}>(), {
 		show: false,
 		cityList: () => [],
@@ -28,9 +28,9 @@
 	const sharePpopup = ref();
 	const props = withDefaults(defineProps<{
-		goodsDetailData ?: any,
+		goodsDetailData : any,
-		show ?: boolean,
+		show : boolean,
-		shareType ?: number,
+		shareType : number,
 	}>(), {
 		goodsDetailData: {},
 		show: false,
@@ -17,9 +17,9 @@
 	const instance = getCurrentInstance();
 	const props = withDefaults(defineProps<{
-		current ?: number,
+		current : number,
-		keyNname ?: string,
+		keyNname : string,
-		list ?: Array<any>,
+		list : Array<any>,
 	}>(), {
 		current: 0,
 		keyNname: 'name',
@@ -8,8 +8,8 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		title ?: string,
+		title : string,
-		color ?: string,
+		color : string,
 	}>(), {
 		title: '查看更多',
 		color: '#6E737D'
@@ -139,9 +139,9 @@
 	const _useLoginStore = useLoginStore();
 	const props = withDefaults(defineProps<{
-		data ?: Array<CategoriesType>,
+		data : Array<CategoriesType>,
-		height ?: number,
+		height : number,
-		statusBarHeight ?: number,
+		statusBarHeight : number,
 	}>(), {
 		data: () => [],
 		height: 0,
@@ -89,8 +89,8 @@
 	const _useLoginStore = useLoginStore();
 	const props = withDefaults(defineProps<{
-		data ?: Array<CategoriesType>,
+		data : Array<CategoriesType>,
-		height ?: number,
+		height : number,
 	}>(), {
 		data: () => [],
 		height: 0,
@@ -12,7 +12,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: Array<CategoriesType>,
+		data : Array<CategoriesType>,
 	}>(), {
 		data: () => [],
 	});
@@ -35,8 +35,8 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: Array<CategoriesType>,
+		data : Array<CategoriesType>,
-		height ?: number,
+		height : number,
 	}>(), {
 		data: () => [],
 		height: 0,
@@ -12,7 +12,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: Array<CategoriesType>,
+		data : Array<CategoriesType>,
 	}>(), {
 		data: () => [],
 	});
@@ -16,7 +16,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {}
 	});
@@ -16,7 +16,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {}
 	});
@@ -5,7 +5,7 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {}
 	});
@@ -5,7 +5,7 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		data ?: string,
+		data : string,
 	}>(), {
 		data: ''
 	});
@@ -39,7 +39,7 @@
 	const _useLoginStore = useLoginStore();
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {}
 	});
@@ -51,7 +51,7 @@
 	import { handleRouteNavigateTo, splitArrayByStep } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -81,7 +81,7 @@
 	import { handleRouteNavigateTo, toDimensionArray, splitArrayByStep } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {}
 	});
@@ -26,9 +26,9 @@
 	const shopConfigStore = useShopConfigStore();
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
-		flex ?: boolean,
+		flex : boolean,
-		fontSize ?: string,
+		fontSize : string,
 	}>(), {
 		data: {},
 		flex: false,
@@ -51,7 +51,7 @@
 	import { handleStaticResources, handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -47,7 +47,7 @@
 	import { handleStaticResources, handleAdvertiseDetail } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -13,7 +13,7 @@
 	import type { PageConfigItemsImgSlideType } from '@/core/models';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -12,7 +12,7 @@
 	import { handleAdvertiseDetail } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -11,7 +11,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -33,7 +33,7 @@
 	import { handleStaticResources, handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -17,7 +17,7 @@
 	import { onHomePageShow } from '@/core/consts';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -11,7 +11,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -49,7 +49,7 @@
 	import { handleStaticResources, handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -16,6 +16,10 @@
 	.card-box { 
 		margin-top: 35rpx;
 		.goods-card {
 			width: 100%;
 		}
 		.price-tag-box {
 			display: flex;
 			align-items: center;
@@ -6,7 +6,7 @@
 		</view>
 		<view class="card-box" v-for="item, index in props.data.list" :key="index">
-			<coreshop-goods-card  :goodsData="hanldeCombinationGoodsData(item)"
+			<coreshop-goods-card class="goods-card" :goodsData="hanldeCombinationGoodsData(item)"
 				@hanldeClickGoods="hanldeClickGoods">
 				<template #goodTag>
 					<view class="price-tag-box" @click="hanldeClickGoods(item)">
@@ -43,7 +43,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -12,13 +12,13 @@
 	import { handleAdvertiseDetail } from '@/core/utils';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
-		dotsSelect ?: boolean,
+		dotsSelect : boolean,
-		autoplaySelect ?: boolean,
+		autoplaySelect : boolean,
-		intervalSelect ?: number,
+		intervalSelect : number,
-		circularSelect ?: boolean,
+		circularSelect : boolean,
-		indicatorColor ?: string,
+		indicatorColor : string,
-		indicatorColorActive ?: string,
+		indicatorColorActive : string,
 	}>(), {
 		data: {},
 		dotsSelect: true,
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 	import HomeContent from '../home-content/home-content.vue';
 	const props = withDefaults(defineProps<{
-		data ?: string,
+		data : string,
 	}>(), {
 		data: '',
 	});
@@ -7,7 +7,7 @@
 	import { ref, onMounted } from 'vue';
 	const props = withDefaults(defineProps<{
-		data ?: any,
+		data : any,
 	}>(), {
 		data: {},
 	});
@@ -75,7 +75,7 @@
 	// import HomeAdpop from './components/home-adpop/home-adpop.vue';
 	const props = withDefaults(defineProps<{
-		coreshopData ?: Array<PageConfigItemsType>,
+		coreshopData : Array<PageConfigItemsType>,
 	}>(), {
 		coreshopData: () => []
 	});
@@ -50,8 +50,8 @@
 	import type { GoodsAgentListType } from "@/core/models";
 	const props = withDefaults(defineProps<{
-		userAgentGrade ?: any,
+		userAgentGrade : any,
-		agentProductsList ?: Array<GoodsAgentListType>,
+		agentProductsList : Array<GoodsAgentListType>,
 	}>(), {
 		userAgentGrade: {},
 		agentProductsList: () => [],
@@ -41,7 +41,7 @@
 	import { useCartStore } from '@/core/store';
 	const props = withDefaults(defineProps<{
-		price ?: number,
+		price : number,
 	}>(), {
 		price: 0,
 	});
@@ -16,7 +16,7 @@
 	import type { CommonQuestionServiceType } from "@/core/models";
 	const props = withDefaults(defineProps<{
-		commonQuestion ?: Array<CommonQuestionServiceType>,
+		commonQuestion : Array<CommonQuestionServiceType>,
 	}>(), {
 		commonQuestion: () => [],
 	});
@@ -12,7 +12,7 @@
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		goodsDetailContent ?: string,
+		goodsDetailContent : string,
 	}>(), {
 		goodsDetailContent: '',
 	});
@@ -32,9 +32,9 @@
 	import { handleRouteNavigateTo } from "@/core/utils";
 	const props = withDefaults(defineProps<{
-		commentsCount ?: number,
+		commentsCount : number,
-		commentsList ?: Array<GoodsPictureListType>,
+		commentsList : Array<GoodsPictureListType>,
-		id ?: number;
+		id : number;
 	}>(), {
 		commentsCount: 0,
 		commentsList: () => [],
@@ -87,9 +87,9 @@
 	const _useLoginStore = useLoginStore();
 	const props = withDefaults(defineProps<{
-		goodsDetailData ?: any,
+		goodsDetailData : any,
-		isActivityGoods ?: boolean,
+		isActivityGoods : boolean,
-		shareType ?: ShareEnum,
+		shareType : ShareEnum,
 	}>(), {
 		goodsDetailData: {},
 		isActivityGoods: false,
@@ -17,7 +17,7 @@
 	import type { GoodsParamsType } from "@/core/models";
 	const props = withDefaults(defineProps<{
-		goodsParamsList ?: Array<GoodsParamsType>,
+		goodsParamsList : Array<GoodsParamsType>,
 	}>(), {
 		goodsParamsList: () => [],
 	});
@@ -12,8 +12,8 @@
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		swiperBanner ?: Array<string>,
+		swiperBanner : Array<string>,
-		video ?: string,
+		video : string,
 	}>(), {
 		swiperBanner: () => [],
 		video: '',
@@ -35,7 +35,7 @@
 	import Point from '@/pages/components/custom-page/components/home-goods/point.vue';
 	const props = withDefaults(defineProps<{
-		queryParams ?: any,
+		queryParams : any,
 	}>(), {
 		queryParams: {
 			id: 10,
@@ -111,11 +111,11 @@
 	import type { GoodsPromotionType, CommonQuestionServiceType } from "@/core/models";
 	const props = withDefaults(defineProps<{
-		isCustomService ?: boolean,
+		isCustomService : boolean,
-		goodsPromotionList ?: Array<GoodsPromotionType>,
+		goodsPromotionList : Array<GoodsPromotionType>,
-		delivery ?: Array<CommonQuestionServiceType>,
+		delivery : Array<CommonQuestionServiceType>,
-		service ?: Array<CommonQuestionServiceType>,
+		service : Array<CommonQuestionServiceType>,
-		spesDesc ?: string,
+		spesDesc : string,
 	}>(), {
 		isCustomService: false,
 		goodsPromotionList: () => [],
@@ -32,14 +32,13 @@
 			<view class="btn-box">
 				<!-- 	<view v-if="props.isShowAddCartBtn" class="btn add-cart" @click="handleAddCart">加入购物车</view> -->
 				<view v-if="props.isShowAddCartBtn" class="core-button-confirm add-cart">
-					<coreshop-button :loading="props.addCartloading" class="core-button-confirm_" :radius="0"
+					<coreshop-button :loading="props.addCartloading" class="core-button-confirm_" :radius="0" title="加入购物车"
-						title="加入购物车" :customStyle="addCartCustomStyle" @onClick="handleAddCart()"></coreshop-button>
+						:customStyle="addCartCustomStyle" @onClick="handleAddCart()"></coreshop-button>
 				</view>
 				<!-- <view class="btn buy-now" @click="handleBuyNow">{{ props.btnBuyTitlt }}</view> -->
 				<view class="core-button-confirm">
 					<coreshop-button :loading="props.buyNowNowloading" class="core-button-confirm_" :radius="0"
-						:title="props.btnBuyTitlt" :customStyle="buyNowCustomStyle"
+						:title="props.btnBuyTitlt" :customStyle="buyNowCustomStyle" @onClick="handleBuyNow()"></coreshop-button>
 						@onClick="handleBuyNow()"></coreshop-button>
 				</view>
 			</view>
 		</view>
@@ -70,14 +69,14 @@
 	const props = withDefaults(defineProps<{
-		showSku ?: boolean,
+		showSku : boolean,
-		goodsDetailData ?: any,
+		goodsDetailData : any,
-		isShowAddCartBtn ?: boolean,
+		isShowAddCartBtn : boolean,
-		btnBuyTitlt ?: string,
+		btnBuyTitlt : string,
-		safeAreaInsetBottom ?: boolean;
+		safeAreaInsetBottom : boolean;
-		buyNowCustomStyle ?: { [key : string] : any },
+		buyNowCustomStyle : { [key : string] : any },
-		buyNowNowloading ?: boolean,
+		buyNowNowloading : boolean,
-		addCartloading ?: boolean
+		addCartloading : boolean
 	}>(), {
 		showSku: false,
 		goodsDetailData: {},
@@ -68,17 +68,17 @@
 	import type { Response, CommonQuestionServiceType, GoodsPictureType, GoodsPictureListType, GoodsParamsType, GoodsAgentListType, GoodsPromotionType } from "@/core/models";
 	const props = withDefaults(defineProps<{
-		isActivityGoods ?: boolean,
+		isActivityGoods : boolean,
-		goodsId ?: number,
+		goodsId : number,
-		goodsDetailData ?: any,
+		goodsDetailData : any,
-		swiperBanner ?: Array<any>,
+		swiperBanner : Array<any>,
-		goodsDetailContent ?: string,
+		goodsDetailContent : string,
-		userAgentGrade ?: any,
+		userAgentGrade : any,
-		agentProductsList ?: Array<GoodsAgentListType>,
+		agentProductsList : Array<GoodsAgentListType>,
-		goodsPromotionList ?: Array<GoodsPromotionType>,
+		goodsPromotionList : Array<GoodsPromotionType>,
-		spesDesc ?: string,
+		spesDesc : string,
-		isCustomService ?: boolean,
+		isCustomService : boolean,
-		shareType ?: ShareEnum,
+		shareType : ShareEnum,
 	}>(), {
 		isActivityGoods: false,        /** 是否是活动商品 */
 		goodsId: 0,                    /** 商品id */
@@ -26,15 +26,15 @@
 	import { queryPay } from '@/core/api';
 	const props = withDefaults(defineProps<{
-		payMethodList ?: Array<PayMethodListType>,
+		payMethodList : Array<PayMethodListType>,
-		orderType ?: PaymentTypeEnum,
+		orderType : PaymentTypeEnum,
-		orderId ?: string,
+		orderId : number,
-		recharge ?: number,
+		recharge : number,
-		userInfo ?: any,
+		userInfo : any,
 	}>(), {
 		payMethodList: () => [],
 		orderType: PaymentTypeEnum.common,
-		orderId: '', /** 如果是商品订单此参数必须 */
+		orderId: 0, /** 如果是商品订单此参数必须 */
 		recharge: 0, /** 如果是充值订单此参数必须 */
 		userInfo: {},
 	});
@@ -26,7 +26,7 @@
 						</view>
 						<view class="order_price">
 							<view class="team_price">
-								<view class="label">团队订单数量(单)</view>
+								<view class="label">团队订单金额(元)</view>
 								<view class="value">
 									{{state.orderInfo?.allOrderMoney ? state.orderInfo?.allOrderMoney  : 0}}
 								</view>