From b05fea19990632b2ec6320cbfaab2bddc87006c0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 22 一月 2026 21:17:36 +0800
Subject: [PATCH] 经销商管理

---
 admin/src/components/business/OperaShopInfoWindow.vue |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/admin/src/components/business/OperaShopInfoWindow.vue b/admin/src/components/business/OperaShopInfoWindow.vue
index 38cdded..4c37612 100644
--- a/admin/src/components/business/OperaShopInfoWindow.vue
+++ b/admin/src/components/business/OperaShopInfoWindow.vue
@@ -4,7 +4,7 @@
       width="100%"
       :visible.sync="visible"
   >
-    <div style="display: block;">
+    <div class="detail-box">
       <div class="platgroup_tabs">
         <div class="tab" :class="{ active: activeGroup === item.id }" @click="groupClick(item)"
              v-for="(item, i) in groupList" :key="i">
@@ -13,7 +13,7 @@
       </div>
     </div>
     <template v-if="activeGroup ==0">
-      <div style="display: block;">
+      <div class="detail-box">
         <div class="header">
           <div  class="header-b">鍩烘湰淇℃伅</div>
           <div v-if="info.status !=1" class="header-green">姝e父</div>
@@ -48,7 +48,7 @@
         </div>
         <div class="info-item"></div>
       </div>
-      <div style="display: block">
+      <div class="detail-box">
         <div class="header">
           <div  class="header-b">璧勮川淇℃伅</div>
         </div>
@@ -79,7 +79,7 @@
         </div>
         <div class="info-item"></div>
       </div>
-      <div style="display: block;margin-bottom: 50px;">
+      <div class="detail-box" style="display: block;margin-bottom: 50px;">
         <div class="header">
           <div  class="header-b">閿�鍞ā寮忓彉鏇磋褰�</div>
         </div>
@@ -110,7 +110,7 @@
       </div>
     </template>
     <template v-else-if="activeGroup == 1">
-      <div style="display: block;">
+      <div class="detail-box">
         <el-form ref="searchForm1"   :model="searchForm1"    style="display: block;" >
           <el-form-item label="" prop="code" style="display: inline-block;margin-right: 30px;">
             <el-input v-model="searchForm1.code" placeholder="璇疯緭鍏ヨ鍗曞彿" @keypress.enter.native="handlePageChange1(1)"></el-input>
@@ -175,21 +175,17 @@
                 stripe
                 border
             >
-              <el-table-column prop="type"  label="鑾峰緱/鎵i櫎" align="center" min-width="150px">
+              <el-table-column prop="code" label="璁㈠崟缂栧彿"   align="center" min-width="120px" show-overflow-tooltip>  </el-table-column>
+              <el-table-column prop="details" label="鍟嗗搧淇℃伅"   align="center" min-width="250px" show-overflow-tooltip>
                 <template slot-scope="{row}">
-                  <span v-if="row.type==0" class="green">鑾峰緱</span>
-                  <span v-else class="red">鎵i櫎</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="code" label="璁㈠崟缂栧彿" fixed align="center" min-width="100px">  </el-table-column>
-              <el-table-column prop="details" label="鍟嗗搧淇℃伅" fixed align="center" min-width="100px">
-                <template slot-scope="{row}">
-                  <div v-if="row.goodsorderDetailList && row.goodsorderDetailList.length"  >
-                      <div v-for="(item) in row.goodsorderDetailList">銆恵{item.name}}銆戦攢鍞环锛歿{item.price||0}} 鏁伴噺锛歿{item.goodsNum||0}}</div>
+                  <div v-if="row.goodsorderDetailList && row.goodsorderDetailList.length"  style="width: 220px">
+                      <div v-for="(item) in row.goodsorderDetailList" style="display: flex">
+                        <div style="flex: 1">銆恵{item.name}}銆�</div><div style="flex: 1">閿�鍞环锛歿{item.price||0}} 鏁伴噺锛歿{item.goodsNum||0}}</div>
+                      </div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="price" label="鍟嗗搧鎬讳环锛堝厓锛�" align="center" min-width="100px">
+              <el-table-column prop="price" label="鍟嗗搧鎬讳环(鍏�)" align="center" min-width="100px">
                 <template slot-scope="{row}">
                    {{(row.totalPrice || 0) - (row.mailPrice||0)}}
                 </template>
@@ -203,10 +199,16 @@
               </el-table-column>
               <el-table-column prop="price" label="瀹炰粯浠锋牸(鍏�)" align="center" min-width="200px"></el-table-column>
               <el-table-column prop="shopSettlement" label="搴旂粨绠楅噾棰�(鍏�)" align="center" min-width="150px"></el-table-column>
-              <el-table-column prop="orderCode" label="搴旂粨绠楅噾棰�(鍏�)" align="center" min-width="150px"></el-table-column>
-              <el-table-column prop="orderCode" label="杩旂敤鎴风Н鍒�" align="center" min-width="150px"></el-table-column>
-              <el-table-column prop="orderCode" label="杩旂粡閿�鍟嗙Н鍒�" align="center" min-width="150px"></el-table-column>
-              <el-table-column prop="createDate" label="鍒涘缓" align="center" min-width="200px"></el-table-column>
+              <el-table-column prop="returnMemberIntegral" label="杩旂敤鎴风Н鍒�" align="center" min-width="150px"></el-table-column>
+              <el-table-column prop="returnCustomerIntegral" label="杩旂粡閿�鍟嗙Н鍒�" align="center" min-width="150px"></el-table-column>
+              <el-table-column prop="payDate" label="鏀粯鏃堕棿" align="center" min-width="200px"></el-table-column>
+              <el-table-column prop="receiveType"  label="鍙栬揣鏂瑰紡" align="center" min-width="150px">
+                <template slot-scope="{row}">
+                  <span v-if="row.receiveType  === 0" class="green">閰嶉��</span>
+                  <span v-else class="red">鑷彁</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="200px"></el-table-column>
             </el-table>
             <pagination
                 @size-change="handleSizeChange1"
@@ -219,13 +221,15 @@
       </div>
     </template>
     <template v-else-if="activeGroup == 2">
-      <div style="display: block;margin-bottom: 50px;">
+      <div  class="detail-box">
         <div class="header">
           <div  class="header-b">绉垎鏄庣粏</div>
           <div  class="header-btn">
             <el-button style="display: inline" type="primary" @click="changeIntegral">绉垎璋冩暣</el-button>
           </div>
         </div>
+        </div>
+      <div style="display: block;margin-bottom: 50px;">
         <TableLayout >
           <!-- 琛ㄦ牸鍜屽垎椤� -->
           <template v-slot:table-wrap>
@@ -237,7 +241,7 @@
                 </div>
               </div>
               <div style="float: right; margin-bottom: 20px;">
-                <el-select  v-model="searchForm2.type"  placeholder="鍏ㄩ儴"  clearable @change="search" style="width: 120px;" >
+                <el-select  v-model="searchForm2.type"  placeholder="鍏ㄩ儴"  clearable @change="handlePageChange2(1)" style="width: 120px;" >
                   <el-option  :key="0" :value="0"  label="鑾峰緱"  ></el-option>
                   <el-option   :key="1" :value="1" label="鎵i櫎"  ></el-option>
                 </el-select>

--
Gitblit v1.9.3