zs 2 jaren geleden
bovenliggende
commit
9f30c582de
2 gewijzigde bestanden met toevoegingen van 29 en 8 verwijderingen
  1. 8 1
      pagesHome/order/appraise.vue
  2. 21 7
      pagesHome/order/order.vue

+ 8 - 1
pagesHome/order/appraise.vue

@@ -2,7 +2,14 @@
 	<mobile-frame>
 		<view class="main">
 			<view class="one">
-				1
+				<view class="one_1">
+					<text class="text1">{{info.name}}{{info.specs}}</text>
+					<text class="text2">好评率</text>
+					<text class="text3">{{info.rate}}%</text>
+				</view>
+				<view class="one_2">
+					<view class="one_2_1" v-for="(item,index) in addressList" :key="index"></view>
+				</view>
 			</view>
 		</view>
 	</mobile-frame>

+ 21 - 7
pagesHome/order/order.vue

@@ -249,7 +249,9 @@
 						total_detail: that.total_detail,
 						coupon: that.coupon,
 						type: that.type,
-						group: that.group_id
+					}
+					if (that?.group_id) {
+						data.group = that.group_id
 					}
 					const arr = await that.$api(`/order`, 'POST', data)
 					if (arr.errcode == '0') {
@@ -265,14 +267,26 @@
 									uni.requestPayment({
 										"provider": "wxpay",
 										...res.data,
-										success(res) {
-											if (that.type == '1' && res.data?.group_id) {
-												uni.navigateTo({
-													url: `/pagesHome/group/share?group_id=${res.data.group_id}`
+										async success(res) {
+											const group = await that.$api('/group/getGroup',
+												'get', {
+													order_id: arr.data,
 												})
+											if (group.errcode == '0') {
+												console.log(group.data);
+												// if (that.type == '1' && res.data?.group_id) {
+												// 	uni.navigateTo({
+												// 		url: `/pagesHome/group/share?group_id=${res.data.group_id}`
+												// 	})
+												// } else {
+												// 	uni.reLaunch({
+												// 		url: `/pagesMy/order/index?status=${'1'}`
+												// 	})
+												// }
 											} else {
-												uni.reLaunch({
-													url: `/pagesMy/order/index?status=${'1'}`
+												uni.showToast({
+													title: group.errmsg,
+													icon: 'none'
 												})
 											}
 										},