dev

src/assets/scss/main.scss

@@ -162,19 +162,4 @@ $lighter-color: rgba(#4D6DE4, 0.5);
   &:hover{
     background: $lighter-color;
   }
-}
-.delete-btn{
-  cursor: pointer;
-  display: inline-block;
-  width: 72px;
-  height: 24px;
-  line-height: 24px;
-  background: #ff0000;
-  border-radius: 3px;
-  color: #FFF;
-  font-size: 12px;
-  text-align: center;
-  &:hover{
-    background: (rgba(#ff0000, 0.5));
-  }
 }

src/components/charge/ChargeQueue.vue

@@ -41,8 +41,7 @@
           <div class="add" @click="addChargeOrder" @mousemove="selected=true" @mouseleave="selected=false">
             <el-icon style="margin-right: 7px">
               <template #default>
-                <img v-if="!selected" style="width: 26px ;height: 22px" src="/static/images/charge/1.png" alt="" srcset="">
+                <img style="width: 26px ;height: 22px" src="/static/images/charge/1-active.png" alt="" srcset="">
-                <img v-else style="width: 26px ;height: 22px" src="/static/images/charge/1-active.png" alt="" srcset="">
               </template>
             </el-icon>
             新增患者
@@ -225,14 +224,13 @@ const selected= ref(false)
       display: flex;
       justify-content: center;
       align-items: center;
-      background: #FFFFFF;
+      background: #4D6DE4;
       border-radius: 6px;
-      border: 1px solid #979797;
       margin-left: 16px;
       cursor: pointer;
+      color: #fff;
       &:hover {
-        background: #4D6DE4;
+        background: rgba(#4D6DE4,0.5);
-        color: #fff;
       }
     }
   }

src/components/charge/OrderDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <Mask :width="1252" :height="777" :is-show="show" @close="show = false" title="订单详情"
-        :show-footer="orderInfo?.status == 1">
+        :show-footer="true">
     <template #default>
       <div class="content">
         <div class="left">
@@ -104,11 +104,7 @@
             </div>
             <div class="item">
               <div class="label">支付方式</div>
-              <div class="value">{{ orderInfo.orderId }}</div>
+              <div class="value">{{ getPayTypeStr(orderInfo.payType) }}</div>
-            </div>
-            <div class="item">
-              <div class="label">发票状态</div>
-              <div class="value" :style="{color:orderInfo.status==1 ? '#4D6DE4':'#63BD39'}">{{orderInfo.status==1 ? "未开票":"已开票"}}</div>
             </div>
             <div class="item">
               <div class="label" style="color: #333333">收-{{ orderInfo.payType ? getPayTypeStr(orderInfo.payType) : "" }}</div>
@@ -127,13 +123,13 @@
         <!--       <el-button type="primary" plain>追溯码</el-button>-->
         <div>
           <!--        <el-button type="danger" plain @click="cancel" v-if="orderInfo.status == 0">取消</el-button>-->
-          <el-button type="danger" plain @click="refund" v-if="orderInfo.status == 1">退款</el-button>
+          <span class="default-btn" @click="refund" v-if="orderInfo.status == 1">退款</span>
-          <el-button type="primary" @click="print" v-if="orderInfo.status == 1">
+          <span class="default-btn" @click="print" v-if="orderInfo.status == 1" style="margin-left: 24px">
             打印
             <el-icon class="el-icon--right">
               <Upload/>
             </el-icon>
-          </el-button>
+          </span>
         </div>
       </div>
     </template>
@@ -350,7 +346,7 @@ onUnmounted(() => {
 .footer {
   height: 100%;
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-end;
   align-items: center;
   padding: 24px;
 }

src/components/charge/RecordsLog.vue

@@ -7,7 +7,7 @@
             <template #title>
               <div class="list-item-content">
                 <span class="disease-name">{{ item.diagnosisMedicalRecord?.diagnosisSummary }}</span>
-                <span class="doctor">{{ item.doctorName }}</span>
+                <span class="doctor">{{ item.salePersonName }}</span>
                 <span class="time">{{ formatListTime(item.createDatetime) }}</span>
               </div>
             </template>

src/components/home/index/PaymentDetails.vue

@@ -136,14 +136,14 @@ const changeDate = (date: any) => {
     cursor: pointer;
     &:hover {
       color: #fff;
-      background: #409EFF;
+      background: rgba(#4D6DE4,0.5);
     }
 
   }
 }
 .active{
   color: #fff !important;
-  background: #409EFF;
+  background: #4D6DE4;
 }
 .detail-price {
   height: 194px;

src/components/member/memberProfile/VipEdit.vue

@@ -406,6 +406,7 @@ const init = (_id: any) => {
       ruleForm.value.area = JSON.parse(ruleForm.value.area)
       ruleForm.value.levelId = ruleForm.value.levelId == 0 ? null : ruleForm.value.levelId
       ruleForm.value.certType=Number(ruleForm.value.certType)
+      ruleForm.value.nation=Number(ruleForm.value.nation)||''
       if (!res.levelId) return
       post("vip/vipLevel/get", {levelId: res.levelId}).then((res: any) => {
         levelName.value = res.name

src/components/registration/Edit.vue

@@ -170,9 +170,9 @@
           退出医保
         </div>
         <div class="bottom-right">
-          <el-button type="primary" @click="save" :disabled="edit_data.status==0">保存</el-button>
+          <span class="default-btn" type="primary" @click="save" :disabled="edit_data.status==0">保存</span>
-          <el-button @click="close">取消</el-button>
+          <span class="default-btn" @click="close" style="margin: 0 24px">取消</span>
-          <el-button v-if="edit_data.status==1" type="danger" @click="registrationCancel">退号</el-button>
+          <span class="default-btn" v-if="edit_data.status==1" @click="registrationCancel">退号</span>
         </div>
       </div>
     </template>

src/components/statistics/over/Revenue.vue

@@ -529,7 +529,7 @@ const initCountChart = () => {
 
     &:hover {
       color: #fff;
-      background: #409EFF;
+      background: rgba(#4D6DE4,0.5);
     }
 
   }
@@ -537,7 +537,7 @@ const initCountChart = () => {
 
 .active {
   color: #fff !important;
-  background: #409EFF;
+  background: #4D6DE4;
 }
 
 .container {

src/views/home/index.vue

@@ -59,10 +59,9 @@ async function getData() {
 </script>
 <style scoped lang="scss">
 @use "@/assets/scss/base";
-
 .container-wrapper {
   display: flex;
-  padding: 24px;
+  padding:0 24px;
   background: #F1F5FB;
 
   .left {