feat(custom): build

src/pages/admin/order_manage/index.vue

@@ -142,11 +142,9 @@ const columns = ref([
 ]);
 
 const getData = async () => {
-  const mer_type = Taro.getStorageSync("mer_type");
   const user_info = Taro.getStorageSync("userInfo");
   const res = await orderStatistics({
-    bid: user_info.bid,
-    type: mer_type,
+    bid: user_info.data.bid,
   });
   orderInfo.value = res.data;
 };

src/pages/admin/order_manage/list/index.vue

@@ -38,24 +38,26 @@
                     }}</view> -->
         </view>
         <view class="line"></view>
-        <view class="center">
+        <view class="center" v-for="(itm, idx) in item.OrderGoods" :key="idx">
           <view class="top">
-            <image :src="item.BindGoods.cover" />
-            <view class="title">{{ item.BindGoods.name }} </view>
+            <image :src="itm.Goods.cover" />
+            <view class="title">{{ itm.Goods.name }} </view>
             <view class="right">
-              <view>{{ item.number }}</view>
-              <view>x{{ item.count }}</view>
+              <view>{{ itm.pay_price }}元</view>
+              <view>{{ itm.pay_integral }}积分</view>
+              <view>x{{ itm.number }}</view>
             </view>
           </view>
-          <!-- <view
-                        class="bom"
-                        style="text-align: right; font-size: 13px"
-                    >
-                        共{{ item.count }}件商品,实付积分:
-                        <text style="color: red">{{ item.number }}</text>
-                    </view> -->
         </view>
         <view class="line"></view>
+        <view class="bom" style="text-align: right">
+          共{{ item.count }}件商品,支付方式:{{
+            item.pay_type === 1 ? "微信" : "积分"
+          }},实付:
+          <text style="color: red">{{
+            item.pay_type === 1 ? item.price : item.exchange
+          }}</text>
+        </view>
       </view>
     </view>
     <nut-empty v-else description="暂无订单数据"></nut-empty>
@@ -65,7 +67,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import Taro from "@tarojs/taro";
-import { getJfOrderList, getActiveOrderList } from "../../../../api/admin";
+import { getActiveOrderList } from "../../../../api/admin";
 
 const opt = ref([
   {
@@ -101,18 +103,12 @@ Taro.useLoad((options) => {
 
 const getData = async () => {
   try {
-    const mer_type = Taro.getStorageSync("mer_type");
     const user_info = Taro.getStorageSync("userInfo");
-    let res: any = null;
     const data = {
-      bid: user_info.bid,
+      bid: user_info.data.bid,
       status: tabVal.value,
     };
-    if (mer_type === 1) {
-      res = await getActiveOrderList(data);
-    } else {
-      res = await getJfOrderList(data);
-    }
+    const res = await getActiveOrderList(data);
     dataList.value = res.data.data;
   } catch (error) {
     Taro.showToast({