From 908df372863c339e52501b5e24086aed57d83874 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Mon, 12 Aug 2024 10:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/assets/images/wx.png           | Bin 0 -> 453 bytes
 fuintAdmin/src/assets/images/xz.png           | Bin 0 -> 467 bytes
 .../src/views/handover/HandoverDetails.vue    |   2 -
 fuintAdmin/src/views/member/manage.vue        |  39 +++++++++++++++---
 fuintAdmin_zt/.env.development                |   5 +--
 5 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 fuintAdmin/src/assets/images/wx.png
 create mode 100644 fuintAdmin/src/assets/images/xz.png

diff --git a/fuintAdmin/src/assets/images/wx.png b/fuintAdmin/src/assets/images/wx.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fdc6e9155a86efa8fde8f02886854266b38239a
GIT binary patch
literal 453
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK#^NA%Cx&(BWL^R}2?0JKu0Xo4
zuW#zqsdMMfoib(0ym|AcPoF+#&YW4ZW=)$m4JZg?%$zxM#*7(21_S`PZ~zxa7J;*Y
zj8^_#+ktk-mjw9*GjQ_o3X3YJsHvNn+PL}!Mpv}=^{-yN;l_g}-+ui1`*vpNW1!L(
zo-U3d7N_4%IbC+hfX9VB$%EPN#N<6Y|Noz^GwGXv`j))NX^|(bic_-PHhpPRk<FQO
z<FNml<a-PbljZj>oSF21+c|OG$8)mWCC_v3EoDEZ)!U@twOa6n{_L++3;68&6M4T#
zoBFbEe`7fL?t<w3n^`ucYB6_B)nmSrx2f%5sAjuiN#{e3os+W{%sLz^^Zwa}rehy@
zJ)Xad&Ul^|obYlPtKG6HT?gx{J-|R!I}kTX#DCq9NlO?!{<&>&cv8Hz+}Qug&UH^d
zir=~IBs$Oep?%uz=IW|c(Ld9@jh;T<HSO6~{s-dmr|b{P&b*>@HMIUqCeY6ep00i_
I>zopr04Z|MaR2}S

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/assets/images/xz.png b/fuintAdmin/src/assets/images/xz.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b2ae966ab504ceed2e1ede6212becc8e27ba7b0
GIT binary patch
literal 467
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK#^NA%Cx&(BWL^R}X#qYVu0Z;K
zU+Dj-q5nJm{!a<~KPmM8ywLyCBmU0`{XZ-G|FqEmGlKt54f;Pd9HeFnkQ)jToDM`G
zU=qxj76xSlrKW{|6riHE(0PqOn-oie{DK)cd3c3IMHN)k)J;rHZCqXb0;4P1`}$XJ
zxbfi0w;#X$vPxX~1XTRa)5S5w;`G}oo<)ZY1YGSuHWW6=Jgj_n_y45G8=i^DJz6<0
zLtkHCJ*{fe7c)<;o~>#XZnB@*7-s$1(fsr1f%&|x|2wS9b=Fwt7f+XySZ(rckHuQI
z1^aW3y>7JnW$R{oA^*r1>m6y^y~<kO{hO;gL3b&S#=BQW4tvG2C9Z{@O6<9oVB)mz
zlGKW{?-NwoZ?0VsS)@4O+|BJ5>U`_CTDUJTEZ2<VzTjt=d_c#6yT)VEq?Ov8DkquW
zFn_3)H*t7V^wrPk;Qv#P;|iXOttyb=`fhkz?#}t}u!FTbRrc?Ry?&|wFY}CDnQKfR
f{?4AN@|WRwhwA2&T(=Z}K4<WB^>bP0l+XkK@s!&?

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue
index 913f1976e..340e0e815 100644
--- a/fuintAdmin/src/views/handover/HandoverDetails.vue
+++ b/fuintAdmin/src/views/handover/HandoverDetails.vue
@@ -249,10 +249,8 @@
 <!--      <detail :dataForm = "recordData"></detail>-->
       <HandoverOnly :recordData = "recordData"></HandoverOnly>
     </el-dialog>
-
   </div>
 </template>
-
 <script>
 import {getHandoverListApi,printLocallyApi} from "@/api/handover/handover";
 
diff --git a/fuintAdmin/src/views/member/manage.vue b/fuintAdmin/src/views/member/manage.vue
index ebcdfd5d2..115c15a50 100644
--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@@ -271,14 +271,22 @@
           </el-select>
         </el-form-item>
         <el-form-item label="会员性别" prop="paymentType">
-          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">
-            <el-option label="现金" value="CASH"></el-option>
-          </el-select>
+<!--          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">-->
+<!--            <el-option label="现金" value="CASH"></el-option>-->
+<!--          </el-select>-->
+          <div class="d-s">
+            <div class="icon-type" v-for="(item,index) in paymentTypelist" :key="index" :class="{ 'acvtive' : index === tindex }" @click="Typeindex(index)" >
+              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex" >
+              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex" >
+              {{item}}</div>
+          </div>
         </el-form-item>
         <el-form-item label="会员年龄" prop="paymentType">
-          <el-input placeholder="请输入内容" v-model="form.age">
-            <template slot="append">.com</template>
-          </el-input>
+          <div class="d-s">
+            <el-input placeholder="请输入年龄" v-model="input"  style="width: 190px"></el-input>
+            <div style="margin: 0 15px">至</div>
+            <el-input placeholder="请输入年龄" v-model="input" style="width: 190px"></el-input>
+          </div>
         </el-form-item>
         <el-form-item label="会员余额" prop="paymentType">
           <el-input placeholder="请输入内容" v-model="form.age">
@@ -358,6 +366,10 @@ export default {
   data() {
     return {
       tabindex: 0,
+        tindex: 0,
+      paymentTypelist:[
+        "全部", "男", "女","不详",
+      ],
       tableData: [{
         status: 0,
         date: '2016-05-02',
@@ -461,6 +473,9 @@ export default {
         }
       });
     },
+    Typeindex(index){
+      this.tindex = index
+    },
     getList() {
       let dateRange = []
       if (this.beginTime && this.endTime) {
@@ -614,4 +629,16 @@ export default {
   display: flex;
   align-items: center;
 }
+.icon-type{
+  display: flex;
+  align-items: center;
+  font-weight: 400;
+  font-size: 14px;
+  color: #999999;
+  margin-right: 20px;
+  cursor: pointer;
+}
+.acvtive{
+  color: #FF770F !important;
+}
 </style>
diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development
index 76e606805..ae17ab6db 100644
--- a/fuintAdmin_zt/.env.development
+++ b/fuintAdmin_zt/.env.development
@@ -11,10 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-
-
-
-VUE_APP_SERVER_URL = 'http://192.168.31.178:8081/'
+VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
 
 
 # cp端地址