团餐结算

api/account.js

@@ -40,6 +40,11 @@ const apiService = {
 	orderClearDetail(id,orderType) {
 		return http.get(`/merchant/account/orderClearDetail?orderId=${id}&orderType=${orderType}`);
 	},
+	//团餐订单结算详情
+	groupOrderClearDetail(id,settleStatus){
+		return http.get(`/merchant/account/groupOrderClearDetail?orderId=${id}&settleStatus=${settleStatus}`);
+	}
+	
 };
 
 export default apiService;

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.1.6.3",
-    "versionCode" : 1163,
+    "versionName" : "1.1.6.7",
+    "versionCode" : 1167,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/finance/components/group-meal-list.vue

@@ -8,10 +8,10 @@
       <uni-td>
         <view class="info">
           <text class="name">{{ item.productName }}</text>
-          <text>x{{ item.quantity }}</text>
+          <text>x{{ item.amount }}</text>
         </view>
       </uni-td>
-      <uni-td v-if="item.orderPrice">¥{{ item.orderPrice.toFixed(2) }}</uni-td>
+      <uni-td v-if="item.productTotalPrice">¥{{ item.productTotalPrice }}</uni-td>
     </uni-tr>
   </uni-table>
 </template>
@@ -24,6 +24,9 @@ export default {
       default: () => [],
     },
   },
+	onLoad() {
+		console.log(this.list)
+	}
 };
 </script>
 

pages/finance/components/order-list.vue

@@ -23,6 +23,10 @@ export default {
       type: String,
       default: '',
     },
+		orderType: {
+		  type: String,
+		  default: '',
+		},
   },
   onLoad(options) {
     if (options.orderType) {
@@ -36,10 +40,19 @@ export default {
   },
   methods: {
     goDetails(item) {
-      const pathName = this.orderType === 2 ? 'groupMealDetails' : 'orderDetails';
-      uni.navigateTo({
-        url: `/pages/finance/${pathName}?id=${item.orderId}&jumpType=${this.jumpType}`,
-      });
+      const pathName = this.orderType == 2 ? 'groupMealDetails' : 'orderDetails';
+      // uni.navigateTo({
+      //   url: `/pages/finance/${pathName}?id=${item.orderId}&jumpType=${this.jumpType}`,
+      // });
+			if( this.orderType==2){
+				uni.navigateTo({
+				  url: `/pages/finance/groupMealDetails?id=${item.orderId}&settleStatus=${item.settleStatus}`
+				});
+			}else{
+				uni.navigateTo({
+				  url: `/pages/finance/orderDetails?id=${item.orderId}&jumpType=${this.jumpType}`
+				});
+			}
     },
   },
 };

pages/finance/dictionary.js

@@ -104,11 +104,6 @@ export const groupMealFields = [
     valueField: 'statementNumber',
     isShowTip: false,
   },
-  {
-    title: '下单时间',
-    valueField: 'createTime',
-    isShowTip: false,
-  },
   {
     title: '成团时间',
     valueField: 'groupMealTime',

pages/finance/groupMealDetails.vue

@@ -24,7 +24,7 @@
               @click.stop="toggleTooltip(item.key)"
             ></image>
             <view class="tooltip" v-show="showTooltip === item.key">
-              商户占比{{ settlementInfo[item.rateField] }}%
+              商户占比{{ settlementInfo.merchantCostRatio}}%
             </view>
           </view>
           <view class="value">{{ settlementInfo[item.valueField] }}</view>
@@ -52,7 +52,7 @@ export default {
   data() {
     return {
       orderId: '',
-      jumpType: '',
+      settleStatus: '',
       settlementInfo: {},
       orderList: [],
       groupMealFields,
@@ -73,22 +73,24 @@ export default {
     }
   },
   onLoad(options) {
+		console.log(options)
     if (options.id) {
       this.orderId = options.id;
-      this.jumpType = options.jumpType;
+      this.settleStatus = options.settleStatus;
     }
   },
   onShow() {
-    this.getDetails(this.orderId, this.jumpType);
+    this.getDetails(this.orderId, this.settleStatus);
   },
   methods: {
-    getDetails(id, jumpType) {
+    getDetails(id, settleStatus) {
+			console.log(id, settleStatus)
       api
-        .settlementDetail({ settlementId: id, jumpType })
+        .groupOrderClearDetail( id, settleStatus)
         .then((res) => {
           if (res.data.code === 200) {
             this.settlementInfo = res.data.result || {};
-            this.orderList = res.data.result.orderList || [];
+            this.orderList = res.data.result.groupProductList || [];
           } else {
             uni.showToast({
               title: res.data.msg || '获取结算详情失败',
@@ -231,13 +233,15 @@ export default {
           font-weight: 400;
           font-size: 31rpx;
           color: #666666;
-          position: relative;
+          
 
           .tooltip {
             display: flex;
             align-items: center;
             justify-content: center;
-            width: 158rpx;
+						position: relative;
+						padding: 0 5rpx;
+            // width: 158rpx;
             height: 42rpx;
             background: rgba(0, 0, 0, 0.6);
             border-radius: 4rpx 4rpx 4rpx 4rpx;
@@ -250,10 +254,11 @@ export default {
             &::after {
               content: '';
               position: absolute;
-              right: 158rpx;
-              bottom: 14rpx;
+              left: 0;
+              bottom: 0;
               width: 0;
               height: 0;
+							transform: translate(-100%,-50%);
               border-bottom: 10rpx solid transparent;
               border-right: 10rpx solid rgba(0, 0, 0, 0.6);
               border-top: 10rpx solid transparent;

pages/finance/settlementDetails.vue

@@ -54,7 +54,7 @@
 
     <!-- 订单列表 -->
     <view class="list-card">
-      <OrderList :list="orderList" :jumpType="jumpType"></OrderList>
+      <OrderList :list="orderList" :jumpType="jumpType" :orderType="orderType"></OrderList>
     </view>
   </view>
 </template>
@@ -76,12 +76,14 @@ export default {
       settlementInfo: {},
       // 订单列表
       orderList: [],
+			orderType:''
     };
   },
   onLoad(options) {
     if (options.id) {
       this.bizId = options.id;
       this.jumpType = options.jumpType;
+			this.orderType = options.orderType
     }
   },
   onShow() {