Merge branch 'prod' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into test

common/api/api.js

@@ -3,12 +3,15 @@ import request from '@/common/api/request.js'
 const url = '/account'
 //根据经纬度获取信息
 export const APIgeocodelocation = (data) => {
-	return request({
+	return new Promise((resove, reject) => {
-		url: url + '/user/geo/geocode',
+		resove(null)
-		method: 'get',
-		data: data,
-		toast: false
 	})
+	// return request({
+	// 	url: url + '/user/geo/geocode',
+	// 	method: 'get',
+	// 	data: data,
+	// 	toast: false
+	// })
 }
 
 //登录

common/api/market/distribution.js

@@ -14,11 +14,11 @@ export const pay = (data) => {
   // #ifdef MP-WEIXIN
   platformType = "WX";
   platformType = "wechat";
-  payType = "wechatPay";
+  payType = "WECHAT";
   // #endif
   // #ifdef MP-ALIPAY
   platformType = "alipay";
-  payType = "aliPay";
+  payType = "ALIPAY";
   // #endif
 
 

common/api/market/package.js

@@ -10,11 +10,11 @@ let platformType = '';
 let payType = '';
 // #ifdef MP-WEIXIN
 platformType = 'wechat'
-payType = 'wechatPay'
+payType = 'WECHAT'
 // #endif
 // #ifdef MP-ALIPAY
 platformType = 'alipay'
-payType = 'aliPay'
+payType = 'ALIPAY'
 // #endif
 
 export const getPackage = (data) => {

common/api/order/gbOrder.js

@@ -6,11 +6,11 @@ let platformType = '';
 let payType='';
 // #ifdef MP-WEIXIN
 platformType = 'wechat'
-payType='wechatPay'
+payType='WECHAT'
 // #endif
 // #ifdef MP-ALIPAY
 platformType = 'alipay'
-payType='aliPay'
+payType='ALIPAY'
 // #endif
 
 export const warePage = (data) => {

common/api/order/index.js

@@ -6,11 +6,11 @@ let platformType = '';
 let payType='';
 // #ifdef MP-WEIXIN
 platformType = 'wechat'
-payType='wechatPay'
+payType='WECHAT'
 // #endif
 // #ifdef MP-ALIPAY
 platformType = 'alipay'
-payType='aliPay'
+payType='ALIPAY'
 // #endif
 
 //订单列表

common/api/order/pointGoods.js

@@ -6,11 +6,11 @@ let platformType = '';
 let payType='';
 // #ifdef MP-WEIXIN
 platformType = 'wechat'
-payType='wechatPay'
+payType='WECHAT'
 // #endif
 // #ifdef MP-ALIPAY
 platformType = 'alipay'
-payType='aliPay'
+payType='ALIPAY'
 // #endif
 
 export const pointGoodsPage = (data) => {

common/config.js

@@ -1,6 +1,6 @@
 // const debug = process.env.NODE_ENV == 'development' ? true : false;
 // const debug = false; // false线上 true本地
-const debug = true; // false线上 true本地
+const debug = false; // false线上 true本地
 let baseUrl = ''
 let baseUrlwws = ''
 

components/goods-price.vue

@@ -15,7 +15,6 @@
 				{{ cart.memberPrice }}
 			</text>
 		</block>
-
 		<text v-else class="salePrice">{{ cart.salePrice }}</text>
 	</text>
 </template>

components/paymentMethod.vue

@@ -97,7 +97,7 @@ const paymentMethodList = ref([
     name: "微信支付",
     type: 2,
     url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-    payType: "wechatPay",
+    payType: "WECHAT",
   },
   // #endif
   // #ifdef MP-ALIPAY

pages/order/confirm-order.vue

@@ -577,7 +577,7 @@
 		name: "微信支付",
 		type: 2,
 		url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-		payType: "wechatPay",
+		payType: "WECHAT",
 	};
 	// #endif
 	// #ifdef MP-ALIPAY

pages/order/detail.vue

@@ -316,7 +316,7 @@
 	const paymentmethod = reactive({
 		radiovalue: 2,
 		paymentBtnText: "微信支付",
-		payType: 'wechatPay'
+		payType: 'WECHAT'
 	})
 
 	const groupChange = async (e) => {

pages/product/components/goods-modal.vue

@@ -126,7 +126,7 @@
 
 					</view>
 
-					<!-- 占位 -->
+					<!-- 占位不用管下面代码也不要删除 -->
 					<view class="shop_bottom" style="opacity: 0;">
 						<view class="flex-between">
 							<view class="price price-sku" v-if="goods.type != 'package' && goods.result">
@@ -210,14 +210,47 @@
 							<text
 								v-if="goods.result.suitNum > 1">「{{ goods.result.suitNum }}{{ goods.result.unitName }}起点」</text>
 						</view>
-						<view class="price price-package  " v-else>
+						<view class="price single-and-staticPackage  "
+							v-else-if="goods.type=='single'||(goods.type=='package'&&goods.groupType==0)">
+
 							<text class="i">￥</text>
 							<view class="num">
 								<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="goods"
 									:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
 							</view>
 							<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
-							<text v-if="goods.suitNum > 1">「{{ goods.suitNum }}{{ goods.unitName }}起点」</text>
+							<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
+						</view>
+						<view class="price choosePackage  "
+							v-else-if="goods.type=='package'&&goods.groupType==1">
+						
+							<text class="i">￥</text>
+							<view class="num">
+								<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="goods"
+									:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
+							</view>
+							<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
+							<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
+						</view>
+						<view class="price sku" v-else-if="goods.type=='sku'">
+
+							<text class="i">￥</text>
+							<view class="num">
+								<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="selSku"
+									:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
+							</view>
+							<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
+							<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
+						</view>
+						<view class="price price-package  " v-else>
+
+							<text class="i">￥</text>
+							<view class="num">
+								<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="selSku"
+									:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
+							</view>
+							<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
+							<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
 						</view>
 						<view v-if="goods.type == 'package'&&goods.groupType==1">
 
@@ -446,7 +479,12 @@
 	const swiperCurrent = ref(0);
 
 	function returnFirstSku(product) {
-		return product.skuList[0]
+		console.log('returnFirstSku', product.skuList[0]);
+		return {
+			...product.skuList[0],
+			sku_id: product.skuList[0].id,
+			id: product.id,
+		}
 	}
 	//返回是否是多规格商品
 	function returnIsSkuGoods(item) {

pages/product/index.vue

@@ -161,9 +161,8 @@
 												@tap.stop="$u.throttle(() => singleclick(item, '-'), 500)"></view> -->
 										</view>
 										<!-- <text class="num">{{ ifcartNumber(item) }}</text> -->
-										
 										<text class="dot num"
-											v-if="returnGoodsImCartNum(item1)">{{ returnGoodsImCartNum(item1) < 99 ? returnGoodsImCartNum(item1) : '99+' }}</text>
+											v-if="returnGoodsImCartNum(item)">{{ returnGoodsImCartNum(item) < 99 ? returnGoodsImCartNum(item) : '99+' }}</text>
 										<view class="btn">
 											<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
 											<!-- <view class="btnClick"
@@ -879,7 +878,7 @@
 			return 0
 		}
 		if (GoodsIDInCartNumMap.value.hasOwnProperty(goods.id)) {
-			GoodsIDInCartNumMap.value[goods.id]
+			return  GoodsIDInCartNumMap.value[goods.id]
 		}
 		return 0
 	}

pages/user/user.vue

@@ -258,7 +258,7 @@ const myFunList = ref([
 	// 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_member.png"
 	// },
 	// { name: "关于", type: "", icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/inRegard.png"},
-	{ name: '联系商家', type: 'contact', icon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/2b0480c32c1844dbae2c09f6a729c6e8.png' }
+	// { name: '联系商家', type: 'contact', icon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/2b0480c32c1844dbae2c09f6a729c6e8.png' }
 ]);
 
 const userInfo = reactive({});

stores/pay.js

@@ -25,7 +25,7 @@ export const Memberpay = defineStore('memberpay', {
 					let res = await APIpayltPayVip({
 						...data,
 						// #ifdef MP-WEIXIN
-						payType: 'wechatPay',
+						payType: 'WECHAT',
 						openId: uni.cache.get('userInfo').wechatOpenId,
 						// #endif
 						// #ifdef MP-ALIPAY
@@ -113,7 +113,7 @@ export const Memberpay = defineStore('memberpay', {
 							}
 						},
 						// #ifdef MP-WEIXIN
-						payType: 'wechatPay',
+						payType: 'WECHAT',
 						openId: uni.cache.get('userInfo').wechatOpenId,
 						// #endif
 						// #ifdef MP-ALIPAY