From fc31d6bc9450ba23af56fed58cfb6f2d1c1c6bf3 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 7 Jul 2024 21:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=9B=BE=E6=A0=87=20?=
 =?UTF-8?q?=E5=92=8C=E5=BD=92=E5=B1=9E=E5=9C=B0=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shenhe.png                    | Bin 0 -> 1279 bytes
 src/components/Table/GoodsItem/GoodsItem.vue |  17 +++++++++++++++++
 src/components/Table/UserItem/UserItem.vue   |  13 ++++++++-----
 src/views/order/Index.vue                    |   7 +++++++
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 src/assets/img/shenhe.png

diff --git a/src/assets/img/shenhe.png b/src/assets/img/shenhe.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2d0ac72913e39f3e291df217318f19b53d19836
GIT binary patch
literal 1279
zcmV<b1OWSqP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px(xk*GpR9Hu~m|@7CQy9np|MI~HA1EIvLWmE_Rx66K)r2T3ibAHgtV||bRw&{F
zv22-G$b_1#Oe~X?DMD5zJ}6|X6=lT-A68bE`}erc(|PXqzMtoQU+=DZ>+L@0T<3qT
z>wo^&bsp<~SVUYSX``f->1Lm#mu-K%P`94%!iYFs(k+rUOS-6M{UJ#^CGD_%d_H>&
z1{4vOOS)6i8cBdE_7_o+bV`n&)fxlXF56!Z0X7FvMBo^w7dDPAm2{<~<;{uDZ#g_D
zX}hGiZJ%H)B2JZbo1_hrmbB&{mb70I(fdKt5!-y5uo0k$xFWd#0MdZtE@R_el3um_
z*|ZZ!1P6Jb0kCR{KhpWLq#q?cM--jJgp7S4IK}5pq?ohUHYplx$+?>|%2!X}9pG*P
z(3hDOHrg!-03iMa^tS&Vy!(KO5pi0Af)dbxtPsUB8$bsE^iL9UgY9htd@lNwh#<9F
zC7l3J<PNKCzcJt4BI3;^|C}1zvp^qrr%Y%u0DV#k<9^%MF5pnZ0p(SGwz*m7^lWrl
zMO26h`Md0QNt?Pj84>dWbZ-hDn;dIy<J07NU=+}_M=K#+XM0C`?R)_h!r|wT?WF_3
zjHX4zx0OhCUYtb*6cJCN9~G&er~xkoP`UQ&ZNJzNPV}Mh=eTV&YHShldZS&d^TSTt
z_q4{*nIgJJZIkv1i-<yt(Y600MQO9`XS&jn#C|VpTzd*&0gWN9bLvwH?b<$(jfjVn
zo5uiDa=hL4{XKw4$p_V@B_e#H`j?b_NS(`h5SmI~G-`$I13ms<XfDipiY|aSInsTg
zDVQsI7BJ2{>~JG~7nFGs@qAWyK5e!AU^Vt@)g?>=^l8?*-2i%|DIHHW)t;JlMrkEl
zJUD59vfcSJBe@ws^g1BKmUp!k5m5sIcuC7>O?9p5b?UT`+S1H*Mkpe#%5LJn{SzU?
zX5mE0tI)Rr(G?V1)^rJ|HO3A6sv5g>7Kf^ob0N+y4caS7PClO7z74GiEgFaN_WqW^
z7)eF}#3{eYlg&}nlL)A;0!wUvH}0vM&ap5Z;kvl)3|oL0zoDvU4`p-DdESz=rApaH
zm3B>VC>yn(a(sNlYe4kXCI1tO8xaT}fV(O_I)mn5RQs-H&rwML8mn|fyd-H|t{X*%
z|0iA@5mC6r*s7+GzF%MeuK#D1j-E9)N<u_29t>;Cyfz?i+V>d=2)@iVy>+k67f{n-
z(o6G%VlT?f(wZJ!?=n({mQWB`fHocJLzH#s`W)ZaR}UF)z@L}CY3@nw%BI8oqW0bS
za*c>PlAz3;32IhaJHYVicH8f?*Y-Z8tCs+4ASDhaPBR2Zf+6aNX}J^|ZP&MP>}u-U
zzG+SF%jXHVh!EpwPR}%hW5@!v5(?1zqI11IX8zdFJS4Bn)0H*?eytfm_Dizn@mj^G
zfkb)lv;)iplp%+N?{e$X8PVbwk1e)I=hz~Gw9rA&Cl!4{-|n)_JASGS0+gT#Ia2?4
z)sg~?i1Ekf{J_ACtA&zR$F{DvrVH6%KxJ`6@KX&fCn`JbR}#v|W9<koT7=q;5*QJq
pedQ+{qC!gcG#$fhL(<a)?q6q~H#n4?*9HIp002ovPDHLkV1iLVUYh^_

literal 0
HcmV?d00001

diff --git a/src/components/Table/GoodsItem/GoodsItem.vue b/src/components/Table/GoodsItem/GoodsItem.vue
index c8accf6..d20cb1d 100644
--- a/src/components/Table/GoodsItem/GoodsItem.vue
+++ b/src/components/Table/GoodsItem/GoodsItem.vue
@@ -9,6 +9,7 @@
       <a-tooltip placement="topLeft" :title="dataObj.title">
         <p class="title twoline-hide" :style="{ width: `${dataObj.titleWidth}px` }">{{ dataObj.title }}</p></a-tooltip
       >
+      <span class="shen" v-if="dataObj.isCheck==1"> <img src="~@/assets/img/shenhe.png" /></span>
       <!-- 副标题 -->
       <p v-if="isEmpty(dataObj.goodsProps)" class="subtitle" :class="{ 'c-p': subTitleColor }">
         <a-tooltip placement="topLeft" :title="dataObj.subtitle"> {{ dataObj.subtitle }}</a-tooltip>
@@ -37,6 +38,7 @@ export default {
     data: PropTypes.object.def({}),
     // 副标题颜色
     subTitleColor: PropTypes.bool.def(false),
+    source: PropTypes.any.def(0),
   },
   computed: {
     dataObj() {
@@ -48,6 +50,7 @@ export default {
           subtitle: '',
           goodsProps: [],
           titleWidth: 200,
+          isCheck:''
         },
         this.$props.data
       )
@@ -64,6 +67,20 @@ export default {
 
 <style lang="less" scoped>
 @size: 60px;
+.shen {
+  width: 22px;
+  height: 22px;
+  border-radius: 50%;
+  background: red;
+  text-align: center;
+  line-height: 22px;
+  img {
+    width: 15px;
+    height: 15px;
+    line-height: 25px;
+    margin-top: -3px;
+  }
+}
 .goods-info {
   width: 270px;
   line-height: 1.3;
diff --git a/src/components/Table/UserItem/UserItem.vue b/src/components/Table/UserItem/UserItem.vue
index 750c1d6..c77ae93 100644
--- a/src/components/Table/UserItem/UserItem.vue
+++ b/src/components/Table/UserItem/UserItem.vue
@@ -12,8 +12,11 @@
       </a-tooltip>
     </div>
     <div class="in-right flex flex-dir-column flex-x-center">
-      <p class="user-name oneline-hide">{{ user.nick_name }}</p>
-      <p class="user-platform">
+      <p class="user-name oneline-hide"> 名 称：{{ user.nick_name }}</p>
+      <p class="user-name oneline-hide">手机号：{{ user.mobile }}</p>
+       <p class="user-name oneline-hide">归属地：{{ JSON.parse(user.homelocation).prov }} {{  JSON.parse(user.homelocation).city }}</p>
+      
+        <p class="user-platform">
         <platform-icon :name="user.platform" :showTips="true" />
       </p>
     </div>
@@ -48,7 +51,7 @@ export default {
 <style lang="less" scoped>
 // 会员信息
 .user-info {
-  width: 160px;
+  width: 180px;
   height: 40px;
   line-height: 1.3;
 
@@ -65,8 +68,8 @@ export default {
 
   .in-right {
     float: left;
-    width: 100px;
-    height: 100%;
+    // width: 100px;
+    // height: 100%;
 
     .user-name {
       margin-bottom: 2px;
diff --git a/src/views/order/Index.vue b/src/views/order/Index.vue
index 9d131a6..b34df45 100644
--- a/src/views/order/Index.vue
+++ b/src/views/order/Index.vue
@@ -98,6 +98,8 @@
                             imageAlt: '商品图片',
                             title: goodsItm.goods_name,
                             goodsProps: goodsItm.goods_props,
+                            isCheck: goodsItm.is_check,
+                            source:1
                           }"
                         />
                       </td>
@@ -278,6 +280,11 @@ const columns = [
     title: '买家',
     dataIndex: 'user',
     scopedSlots: { customRender: 'user' }
+  },
+   {
+    title: '归属地',
+    dataIndex: 'user',
+    scopedSlots: { customRender: 'user' }
   },
   {
     title: '支付方式',