From f1415fb0425f6cdb24ac3ca6808222c3c0e3444e Mon Sep 17 00:00:00 2001
From: wangweijia <495720349@qq.com>
Date: Fri, 10 Apr 2020 14:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=98=8E=E7=BB=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kiisoo-ic-ui/src/pages/CustomerDetail.vue | 40 ++++++++++++-----------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/kiisoo-ic-ui/src/pages/CustomerDetail.vue b/kiisoo-ic-ui/src/pages/CustomerDetail.vue
index 18456ad..6f0e584 100644
--- a/kiisoo-ic-ui/src/pages/CustomerDetail.vue
+++ b/kiisoo-ic-ui/src/pages/CustomerDetail.vue
@@ -36,7 +36,7 @@
           <row>
             <Table :columns="columns1" :data="data1" style="margin-top: 20px;" size="small" no-data-text="--"></Table>
           </row>
-          <Modal v-model="modal12" draggable scrollable title="客户信息" width="977px" height="651px" okText="保存" @on-ok="asyncOK">
+          <Modal v-model="modal12" draggable scrollable title="客户信息" width="977px" height="651px" >
             <row style="padding: 10px 0">
                 <i-col span="12" >
                   <row>
@@ -53,49 +53,45 @@
                     <span class="txt-font-b" style="width: 80px;display:inline-block;text-align: right;">关联会员</span>
                   </row>
                   <row style="margin-top: 16px;margin-left: 98px">
-                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">会员名称</span>&nbsp;
+                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">会员名称</span>
                     <span class="txt-font-b" style="font-weight: 600">{{customerData.vipName}}</span>
+                    <Button v-if="customerData.vipName != '--'"  type="primary" size="small" style="margin-left: 10px;height: 19px;margin-bottom: 3px;" ></Button>
                   </row>
                   <row style="margin-top: 16px;margin-left: 98px">
                     <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left;">手机号</span>
-                    <span class="txt-font-b" style="font-weight: 600"><!--{{customerData.vipPhone}}-->18357370548</span>
+                    <span class="txt-font-b" style="font-weight: 600">{{customerData.vipPhone}}</span>
                   </row>
                   <row style="margin-top: 16px;margin-left: 98px">
-                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left;">会员生日</span>&nbsp;
+                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left;">会员生日</span>
                     <span class="txt-font-b" style="font-weight: 600">{{customerData.birthday}}</span>
                   </row>
                   <row style="margin-top: 16px;margin-left: 98px">
                     <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">消费次数</span>
                   </row>
                   <row style="margin-top: 16px;margin-left: 98px">
-                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">消费金额</span>&nbsp;
-                    <span class="txt-font-b" style="font-weight: 600">客户Id</span>
+                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">消费金额</span>
+                    <span class="txt-font-b" style="font-weight: 600">消费金额</span>
                   </row>
                   <row style="margin-top: 16px;margin-left: 98px">
                     <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">最近消费</span>
                   </row>
                   <row style="margin-top: 16px;margin-left: 98px">
-                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">专属导购</span>&nbsp;
+                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">专属导购</span>
                     <span class="txt-font-b" style="font-weight: 600">{{customerData.sellerName}}</span>
                   </row>
                   <row style="margin-top: 16px;margin-left: 98px">
-                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">所属门店</span>&nbsp;
+                    <span class="txt-font-b margin-right" style="width: 80px;display:inline-block;text-align: left">所属门店</span>
                     <span class="txt-font-b" style="font-size: 16px;font-weight: 600">{{customerData.shopName}}</span>
                   </row>
                 </i-col>
             </row>
+            <div slot="footer">
+              <Button type="primary" size="large" @click="asyncOK" style="float: left;margin-left: 110px">保存</Button>
 
+              <Button type="text" size="large"  @click="asyncCancel" style="margin-left: 42px;float: left;border:none">取消</Button>
+              <input style="background-color: Transparent;visibility:hidden;height: 50px" ></input>
+            </div>
 
-<!--            <div style="width: 250px;position:relative;">-->
-<!--              <div>ssss</div>-->
-<!--              <div>ssss</div>-->
-<!--              <div>ssss</div>-->
-<!--            </div >-->
-<!--            <div style="width: 50%;position:relative;float: right">-->
-<!--                <div>ssss</div>-->
-<!--                <div>ssss</div>-->
-<!--                <div>ssss</div>-->
-<!--            </div>-->
           </Modal>
           <Page :total="totalSize" :current="pageNum" :page-size="pageSize" show-elevator show-total
                 placement="top" @on-change="handlePage" style="margin: 20px 50px 0 0;right:0px;position: absolute;"></Page>
@@ -107,7 +103,7 @@
 <script>
    import customerDetail from "../services/datacenter/DataCenter";
     export default {
-
+        inject:['checkParamBlank'],
         data() {
             return {
               //开始时间，结束时间
@@ -328,6 +324,12 @@
               customerDetail.editCustomerData(request,null);
               that.getCustomerData();
             }
+            that.asyncCancel();
+          },
+          asyncCancel: function(){
+            let that = this;
+            that.modal12 = false;
+
           },
           //切页处理
           handlePage:function (value) {