diff --git a/config/index.js b/config/index.js
index 1271fd8..6c908b7 100644
--- a/config/index.js
+++ b/config/index.js
@@ -46,7 +46,7 @@ module.exports = {
       }
     },
     // Various Dev Server settingsss
-    host: "192.168.31.193", // can be overwritten by process.env.HOST
+    host: "192.168.31.195", // can be overwritten by process.env.HOST
     port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
diff --git a/dist.zip b/dist.zip
index e66d345..22d1b9a 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/login/login.vue b/src/login/login.vue
index 958fb84..606c980 100644
--- a/src/login/login.vue
+++ b/src/login/login.vue
@@ -16,7 +16,7 @@
           <el-form-item label="密码：" :rules="[
               { required: true, message: '请输入密码', trigger: ['blur' ,'change']},
             ]" prop="password">
-            <el-input label="密码" type="password" v-focus ref="password" v-model="form.password" autocomplete="off" @keyup.enter.native="submitPassword"></el-input>
+            <el-input label="密码" type="password"  ref="password" v-model="form.password" autocomplete="off" @keyup.enter.native="submitPassword"></el-input>
           </el-form-item>
           <el-form-item>
             <router-link :to="route">
@@ -35,7 +35,7 @@
           <el-form-item label="手机号码：" prop="mobilePhone">
             <el-input @blur="staffOne" v-model="form.mobilePhone" placeholder="请输入手机号" maxlength="11"></el-input>
           </el-form-item>
-          <el-form-item label="验证码：" prop="code" :rules="[
+          <el-form-item label="验证码：" prop="passCode" :rules="[
               { required: true, message: '请输入验证码', trigger: ['blur' ,'change']},
             ]">
             <el-input style="margin-bottom: 15px" v-model="form.passCode" placeholder="请输入验证码"></el-input>
diff --git a/src/pages/eashier/collectionList/components/detail.vue b/src/pages/eashier/collectionList/components/detail.vue
index 8ede784..26d8105 100644
--- a/src/pages/eashier/collectionList/components/detail.vue
+++ b/src/pages/eashier/collectionList/components/detail.vue
@@ -117,7 +117,7 @@
     </span>
     <span v-else slot="footer" class="dialog-footer">
       <!-- 补单才需要短信重发 -->
-      <el-button size="mini" type="primary" @click="handleReissue" v-if="form.isAddition===1">短信重发</el-button>
+      <el-button size="mini" type="primary" @click="handleReissue" >短信重发</el-button>
       <el-button size="mini" type="primary" plain @click="cancel()">取 消</el-button>
       <el-button v-if="form.isCancel==0" size="mini" type="primary" @click="subStaffRatio()">修 改</el-button>
     </span>
diff --git a/src/pages/eashier/reatment/components/detail.vue b/src/pages/eashier/reatment/components/detail.vue
index 5db1a0d..41d3fdf 100644
--- a/src/pages/eashier/reatment/components/detail.vue
+++ b/src/pages/eashier/reatment/components/detail.vue
@@ -115,7 +115,7 @@
     </span>
     <span v-else slot="footer" class="dialog-footer">
       <!-- 补单才需要短信重发 -->
-      <el-button size="mini" type="primary" @click="handleReissue" v-if="form.isAddition===1">短信重发</el-button>
+      <el-button size="mini" type="primary" @click="handleReissue">短信重发</el-button>
       <el-button size="mini" type="primary" plain @click="cancel()">取 消</el-button>
       <el-button v-if="form.isCancel==0" size="mini" type="primary" @click="subStaffRatio()">修 改</el-button>
     </span>
diff --git a/src/pages/eashier/service/detail/detail.vue b/src/pages/eashier/service/detail/detail.vue
index 5e112e8..312bfbd 100644
--- a/src/pages/eashier/service/detail/detail.vue
+++ b/src/pages/eashier/service/detail/detail.vue
@@ -46,8 +46,8 @@
       </el-table-column>
       <el-table-column align="center" prop="" label="人数" min-width="100">
         <template slot-scope="scope">
-          <span class="text-blue">{{scope.row.man?(' 男 '+scope.row.man):''}}</span>
-          <span class="text-red">{{scope.row.woman?(' 女 '+scope.row.woman):''}}</span>
+          <span class="text-blue">{{scope.row.manNumber?(' 男 '+scope.row.manNumber):''}}</span>
+          <span class="text-red">{{scope.row.womanNumber?(' 女 '+scope.row.womanNumber):''}}</span>
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip min-width="100" align="center" prop="payType" label="支付类型"></el-table-column> 
diff --git a/src/pages/eashier/service/detail/editform.vue b/src/pages/eashier/service/detail/editform.vue
index 4408637..672143d 100644
--- a/src/pages/eashier/service/detail/editform.vue
+++ b/src/pages/eashier/service/detail/editform.vue
@@ -173,7 +173,7 @@
     </div>
     <div slot="footer" class="dialog-footer" v-else>
       <!-- 只有补单才需要重发短信 -->
-      <el-button type="primary" size="mini" @click="reissueSms()" v-if="form.isAddition===1">短信重发</el-button>
+      <el-button type="primary" size="mini" @click="reissueSms()">短信重发</el-button>
       <el-button type="primary" plain size="mini" @click="handleClose">取消</el-button>
       <el-button :disabled="form.isCancel==1" type="primary" size="mini" @click="confirm()">{{title=='作废'?title:"确定"}}</el-button>
     </div>
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index db7711f..9d9b020 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -1026,7 +1026,8 @@ export default {
           if(item.transactionPrice){
             if(item.collectionRechargeAmount){
               // 卡付
-              card+=((item.collectionRechargeAmount).toFixed(2)*1)
+              // card+=(item.collectionRechargeAmount.toFixed(2)*1)
+              card = ((item.collectionRechargeAmount*1+card*1).toFixed(2)*1)
               // item.rechargeAccountList.forEach(item=>{ //算上赠送金额
               //   item.giftSpendMoney?item.giftSpendMoney:0
               //   card+=item.giftSpendMoney
@@ -1425,9 +1426,7 @@ export default {
       let appearPrice = this.list[this.projectIndex].transactionPrice - (this.list[this.projectIndex].collectionAmounts?this.list[this.projectIndex].collectionAmounts*1:0) //本次需要支付的钱
       if(this.useRecharge == 1){ //门店参数 按比例支付
         //  上一次输入的没变
-        console.log('上一次--->',this.spendMoney,'现在--->',row.spendMoney)
         if(this.spendMoney === row.spendMoney){
-          console.log('我会到这里呀！！！！')
           // 上一次没改变
           row.cardOvers = (row.cardOvers - (row.spendMoney*1)).toFixed(2)*1
           this.updataList()
@@ -1448,7 +1447,6 @@ export default {
               //  够支付，按比例扣除,可能赠送存在或者不存在
               let balanceProportion = row.cardOvers*1/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))  //可用余额比例
               let giveProportion =  (row.cardGiftOvers*1 + (row.giftSpendMoney?row.giftSpendMoney*1:0))/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))//赠送金额比例
-              console.log('--------->比例',balanceProportion,giveProportion)
               let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) //可用折算 (比例除以折扣)
               let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) //赠送折算
               let convertedNum = appearPrice/(balanceConverted+giveConverted) //消费金额折算份数
@@ -2197,7 +2195,7 @@ export default {
           storeId: sessionStorage.getItem("parentId")
         }).then(res => {
           if (res.code == "000000") {
-            this.memberForm = {...res.data,manNumber:1};
+            this.memberForm = {...res.data};
             this.debtMoneys = res.data.debtMoneys;
             this.cashNumber = 1;
             this.list = [];
diff --git a/src/pages/storeManage/dept/index.vue b/src/pages/storeManage/dept/index.vue
index ef76539..b625643 100644
--- a/src/pages/storeManage/dept/index.vue
+++ b/src/pages/storeManage/dept/index.vue
@@ -7,6 +7,11 @@
     </div>
     <el-table :data="list" @row-dblclick="confirm" stripe style="width: 100%;margin-top:5px" show-summary :row-class-name="rowClassName" :header-cell-style=" {background: 'linear-gradient(#6cb3ff, #1873d4)' , color: '#eeeeee' , }">
      <el-table-column align="center" prop="deptNames" label="部门" min-width="80" show-overflow-tooltip> </el-table-column>
+     <el-table-column align="center" prop="cashSum" label="总现金业绩" min-width="80" show-overflow-tooltip>
+      <template slot-scope="scope">
+        {{ scope.row.recharge + scope.row.courseSum + scope.row.cashierCash }}
+      </template>
+     </el-table-column>
      <el-table-column align="center"  label="充值业绩" min-width="80" show-overflow-tooltip>
       <el-table-column align="center" prop="recharge" label="总业绩" min-width="80" show-overflow-tooltip> </el-table-column>
       <el-table-column align="center" prop="rechargecar" label="充值" min-width="80" show-overflow-tooltip> </el-table-column>
@@ -22,7 +27,7 @@
       <el-table-column align="center" prop="cashierRecharge" label="充值卡付" min-width="80" show-overflow-tooltip> </el-table-column>
       <el-table-column align="center" prop="cashierCard" label="疗程卡付" min-width="80" show-overflow-tooltip> </el-table-column>
      </el-table-column>
-      <el-table-column align="center" prop="courseCard" label="充值卡购买疗程" min-width="80" show-overflow-tooltip> </el-table-column>
+     <el-table-column align="center" prop="courseCard" label="充值卡购买疗程" min-width="80" show-overflow-tooltip> </el-table-column>
      <el-table-column align="center"  label="退款" min-width="80" show-overflow-tooltip>
       <el-table-column align="center" prop="refundRechagre" label="充值" min-width="80" show-overflow-tooltip> </el-table-column>
       <el-table-column align="center" prop="refundCourse" label="疗程" min-width="80" show-overflow-tooltip> </el-table-column>