diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 0c37b39..a3e04c8 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -9,9 +9,11 @@
       label-width="90px"
     >
       <el-form-item label="所属护理站" prop="nurseStationName">
-        <el-button type="" class="stationbtn" @click="ParamsStation(true)">{{
-          queryParams.nurseStationName
-        }}</el-button>
+        <el-button
+          type
+          class="stationbtn"
+          @click="ParamsStation(true)"
+        >{{queryParams.nurseStationName}}</el-button>
       </el-form-item>
       <el-form-item label="订单编号" prop="orderNo">
         <el-input
@@ -23,17 +25,13 @@
       </el-form-item>
 
       <el-form-item label="订单状态" prop="orderStatus">
-        <el-select
-          v-model="queryParams.orderStatus"
-          placeholder="请选择订单状态"
-        >
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态">
           <el-option
             v-for="item in orderStatuslist"
             :key="item.value"
             :label="item.label"
             :value="item.value"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="联系电话" prop="phone">
@@ -45,87 +43,30 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table
-      v-loading="loading"
-      :data="goodsOrderList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="goodsOrderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" align="center" />
-      <el-table-column
-        label="所属护理站"
-        align="center"
-        prop="nurseStationName"
-      />
-      <el-table-column
-        label="订单编号"
-        align="center"
-        prop="orderNo"
-        width="190"
-      />
+      <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
+      <el-table-column label="订单编号" align="center" prop="orderNo" width="190" />
       <el-table-column label="商品名称" align="center" prop="goodsName" />
-
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
-      <el-table-column
-        label="订单状态"
-        align="center"
-        width="95"
-        prop="orderStatus"
-      >
+      <el-table-column label="订单状态" align="center" width="95" prop="orderStatus">
         <template slot-scope="scope">
           <!-- {{ orderStatus(scope.row.orderStatus) }} -->
-          <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
-            >待付款</el-button
-          >
-          <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'"
-            >待发货</el-button
-          >
-          <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
-            >已取消</el-button
-          >
-          <el-button
-            type="primary"
-            v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'"
-            >待收货</el-button
-          >
-          <el-button
-            type="primary"
-            v-if="scope.row.orderStatus == 'RECEIVED_GOODS'"
-            >待评价</el-button
-          >
-          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
-            >交易完成</el-button
-          >
-          <el-button
-            type="warning"
-            v-if="scope.row.orderStatus == 'WAIT_REFUND'"
-            >退款中</el-button
-          >
-          <el-button
-            type="warning"
-            v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'"
-            >待退货</el-button
-          >
-          <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'"
-            >退款成功</el-button
-          >
-          <el-button
-            type="danger"
-            v-if="scope.row.orderStatus == 'RETURNED_GOODS'"
-            >已退货</el-button
-          >
+          <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'">待付款</el-button>
+          <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'">待发货</el-button>
+          <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'">已取消</el-button>
+          <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'">待收货</el-button>
+          <el-button type="primary" v-if="scope.row.orderStatus == 'RECEIVED_GOODS'">待评价</el-button>
+          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'">交易完成</el-button>
+          <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_REFUND'">退款中</el-button>
+          <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'">待退货</el-button>
+          <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'">退款成功</el-button>
+          <el-button type="danger" v-if="scope.row.orderStatus == 'RETURNED_GOODS'">已退货</el-button>
         </template>
       </el-table-column>
       <el-table-column label="订单类型" align="center" prop="orderType">
@@ -135,19 +76,8 @@
           {{ scope.row.orderType == "HEALTH_CONSULTATION" ? "健康咨询" : "" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="下单时间"
-        align="center"
-        prop="orderTime"
-        width="180"
-      />
-
-      <el-table-column
-        label="联系电话"
-        align="center"
-        prop="phone"
-        width="180"
-      />
+      <el-table-column label="下单时间" align="center" prop="orderTime" width="180" />
+      <el-table-column label="联系电话" align="center" prop="phone" width="180" />
       <el-table-column label="下单方式" align="center" prop="orderChannel">
         <template slot-scope="scope">
           {{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }}
@@ -168,8 +98,7 @@
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
             v-hasPermi="['system:goodsOrder:editExpressNo']"
-            >修改物流单号</el-button
-          >
+          >修改物流单号</el-button>
           <el-button
             v-if="
               scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
@@ -180,8 +109,7 @@
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
             v-hasPermi="['system:goodsOrder:editExpressNo']"
-            >录入物流单号</el-button
-          >
+          >录入物流单号</el-button>
           <el-button
             v-if="
               scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
@@ -192,15 +120,10 @@
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
             v-hasPermi="['system:goodsOrder:editExpressNo']"
-            >录入物流单号</el-button
-          >
+          >录入物流单号</el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -208,8 +131,7 @@
             icon="el-icon-edit"
             @click="seeOrder(scope.row)"
             v-hasPermi="['system:goodsOrder:goodsOrderByOrder']"
-            >订单详情</el-button
-          >
+          >订单详情</el-button>
 
           <el-button
             v-if="scope.row.orderStatus == 'WAIT_REFUND'"
@@ -218,8 +140,7 @@
             icon="el-icon-edit"
             @click="refund(scope.row.id)"
             v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
-            >确认退款</el-button
-          >
+          >确认退款</el-button>
           <!-- <el-button
             v-else
             size="mini"
@@ -228,7 +149,7 @@
             disabled
             v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
             >确认退款</el-button
-          > -->
+          >-->
         </template>
       </el-table-column>
     </el-table>
@@ -240,28 +161,13 @@
       @pagination="getList"
     />
     <!-- 查看商品订单弹框 -->
-    <el-dialog
-      title="订单详情"
-      :visible.sync="innerorder"
-      append-to-body
-      width="1200px"
-    >
-      <el-form
-        :inline="true"
-        ref="orderList"
-        :model="orderList"
-        :rules="rules"
-        label-width="120px"
-      >
+    <el-dialog title="订单详情" :visible.sync="innerorder" append-to-body width="1200px">
+      <el-form :inline="true" ref="orderList" :model="orderList" :rules="rules" label-width="120px">
         <el-form-item label="订单编号" prop="orderNo">
           <el-input v-model="orderList.orderNo" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="商品名称" prop="goodsName">
-          <el-input
-            v-model="orderList.goodsName"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.goodsName" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="订单类型" prop="orderType">
           <el-select
@@ -275,78 +181,47 @@
               :key="item.value"
               :label="item.label"
               :value="item.value"
-            >
-            </el-option>
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="兑换商品数量" prop="integralExchangeCount"  v-if="orderList.orderType=='INTEGRAL_EXCHANGE'">
-          <el-input
-            v-model="orderList.integralExchangeCount"
-            disabled
-            style="width: 240px"
-          />
+        <el-form-item
+          label="兑换商品数量"
+          prop="integralExchangeCount"
+          v-if="orderList.orderType=='INTEGRAL_EXCHANGE'"
+        >
+          <el-input v-model="orderList.integralExchangeCount" disabled style="width: 240px" />
         </el-form-item>
-        <el-form-item label="兑换积分数" prop="integralExchangeSill"  v-if="orderList.orderType=='INTEGRAL_EXCHANGE'">
-          <el-input
-            v-model="orderList.integralExchangeSill"
-            disabled
-            style="width: 240px"
-          />
+        <el-form-item
+          label="兑换积分数"
+          prop="integralExchangeSill"
+          v-if="orderList.orderType=='INTEGRAL_EXCHANGE'"
+        >
+          <el-input v-model="orderList.integralExchangeSill" disabled style="width: 240px" />
         </el-form-item>
-        <el-form-item label="商品数量" prop="goodsCount"  v-if="orderList.orderType=='DIRECT_BUY'">
-          <el-input
-            v-model="orderList.goodsCount"
-            disabled
-            style="width: 240px"
-          />
+        <el-form-item label="商品数量" prop="goodsCount" v-if="orderList.orderType=='DIRECT_BUY'">
+          <el-input v-model="orderList.goodsCount" disabled style="width: 240px" />
         </el-form-item>
-        <el-form-item label="订单原始总金额" prop="originalTotalPrice"  >
-          <el-input
-            v-model="orderList.originalTotalPrice"
-            disabled
-            style="width: 240px"
-          />
+        <el-form-item label="订单原始总金额" prop="originalTotalPrice">
+          <el-input v-model="orderList.originalTotalPrice" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="优惠券名称" prop="couponTitle">
-          <el-input
-            v-model="orderList.couponTitle"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.couponTitle" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="优惠金额" prop="discountPrice">
-          <el-input
-            v-model="orderList.discountPrice"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.discountPrice" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="订单应付总金额" prop="totalPrice">
-          <el-input
-            v-model="orderList.totalPrice"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.totalPrice" disabled style="width: 240px" />
         </el-form-item>
-      
         <el-form-item label="收货人" prop="receiveAddress">
-          <el-input
-            v-model="orderList.receiver"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.receiver" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="收货地址" prop="receiveAddress">
-          <el-input
-            v-model="orderList.receiveAddress"
-            disabled
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.receiveAddress" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="orderList.phone" disabled style="width: 240px" />
         </el-form-item>
-
         <!-- <el-form-item label="商品属性" prop="goodsAttributeName">
           <el-input
             v-model="orderList.goodsAttributeName"
@@ -355,7 +230,7 @@
             :disabled="true"
             style="width: 240px"
           />
-        </el-form-item> -->
+        </el-form-item>-->
         <!-- <el-form-item label="商品价格" prop="goodsPrice">
           <el-input
             v-model="orderList.goodsPrice"
@@ -364,7 +239,7 @@
             :disabled="true"
             style="width: 240px"
           />
-        </el-form-item> -->
+        </el-form-item>-->
         <!-- <el-form-item label="地址" prop="receiveAddress">
           <el-input
             v-model="orderList.receiveAddress"
@@ -373,14 +248,9 @@
             :disabled="true"
             style="width: 240px"
           />
-        </el-form-item> -->
-
+        </el-form-item>-->
         <el-form-item label="订单状态" prop="orderStatus">
-          <el-input
-            :value="orderStatusinfo(orderList.orderStatus)"
-            disabled
-            style="width: 240px"
-          />
+          <el-input :value="orderStatusinfo(orderList.orderStatus)" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="下单方式" prop="buySource">
           <el-input
@@ -390,11 +260,7 @@
           />
         </el-form-item>
         <el-form-item label="购买来源" prop="orderChannel">
-          <el-input
-            :value="buySourceinfo(orderList.buySource)"
-            disabled
-            style="width: 240px"
-          />
+          <el-input :value="buySourceinfo(orderList.buySource)" disabled style="width: 240px" />
         </el-form-item>
 
         <el-form-item label="综合评分" v-if="orderList.compositeScore">
@@ -407,15 +273,8 @@
               show-score
               text-color="#ff9900"
               score-template="{value}"
-            >
-            </el-rate>
-            <el-input
-              v-else
-              type="text"
-              disabled
-              style="width: 240px"
-              placeholder="未评分"
-            ></el-input>
+            ></el-rate>
+            <el-input v-else type="text" disabled style="width: 240px" placeholder="未评分"></el-input>
           </div>
         </el-form-item>
         <el-form-item label="评价内容" v-if="orderList.evaluateContent">
@@ -438,7 +297,7 @@
               style="width: 23%; height: 100%; margin: 1%"
               v-for="(item, index) in ratelist"
               :src="baseurl + item.evaluatePictureUrl"
-              alt=""
+              alt
               :key="index"
             />
           </div>
@@ -492,16 +351,11 @@
           align="center"
         >
         </el-table-column>
-      </el-table> -->
+        </el-table>-->
       </el-form>
     </el-dialog>
     <!-- 查看物流信息弹框 -->
-    <el-dialog
-      title="录入物流单号"
-      :visible.sync="innerlogistics"
-      append-to-body
-      width="500px"
-    >
+    <el-dialog title="录入物流单号" :visible.sync="innerlogistics" append-to-body width="500px">
       <el-form
         :model="queryexpressNo"
         ref="queryForm"
@@ -514,7 +368,7 @@
           <el-input
             style="width: 230px"
             v-model="queryexpressNo.receiver"
-            placeholder=""
+            placeholder
             clearable
             disabled
           />
@@ -523,7 +377,7 @@
           <el-input
             style="width: 230px"
             v-model="queryexpressNo.phone"
-            placeholder=""
+            placeholder
             clearable
             disabled
           />
@@ -534,7 +388,7 @@
             style="width: 230px"
             type="textarea"
             :rows="5"
-            placeholder=""
+            placeholder
             disabled
             clearable
           />
@@ -554,12 +408,7 @@
       </div>
     </el-dialog>
     <!-- 退款弹框 -->
-    <el-dialog
-      title="退款信息"
-      :visible.sync="innerrefund"
-      append-to-body
-      width="700px"
-    >
+    <el-dialog title="退款信息" :visible.sync="innerrefund" append-to-body width="700px">
       <el-form
         :model="refundlist"
         ref="queryForm"
@@ -569,64 +418,46 @@
         label-width="110px"
       >
         <el-form-item label="商品名称" prop="goodsName">
-          <el-input
-            v-model="refundlist.goodsName"
-            placeholder=""
-            clearable
-            disabled
-          />
+          <el-input v-model="refundlist.goodsName" placeholder clearable disabled />
         </el-form-item>
         <el-form-item label="退款类型" prop="refundType">
-          <el-input
-            :value="refundTypeStatus(refundlist.refundType)"
-            disabled
-            style="width: 205px"
-          />
+          <el-input :value="refundTypeStatus(refundlist.refundType)" disabled style="width: 205px" />
         </el-form-item>
         <el-form-item label="订单类型" prop="orderType">
-          <el-select
-            v-model="refundlist.orderType"
-            placeholder="请选择订单类型"
-            disabled
-          >
+          <el-select v-model="refundlist.orderType" placeholder="请选择订单类型" disabled>
             <el-option
               v-for="item in orderTypelist"
               :key="item.value"
               :label="item.label"
               :value="item.value"
-            >
-            </el-option>
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="退款原因" prop="dictLabel">
-          <el-input
-            v-model="refundlist.dictLabel"
-            placeholder=""
-            clearable
-            disabled
-          />
+          <el-input v-model="refundlist.dictLabel" placeholder clearable disabled />
         </el-form-item>
-
         <el-form-item label="退款金额" prop="godTotalPrice">
-          <el-input
-            v-model="refundlist.godTotalPrice"
-            placeholder=""
-            clearable
-            disabled
-          />
+          <el-input v-model="refundlist.godTotalPrice" placeholder clearable disabled />
+        </el-form-item>
+        <el-form-item
+          label="退款积分"
+          prop="godTotalPrice"
+          v-if="refundlist.orderType =='INTEGRAL_EXCHANGE'"
+        >
+          <el-input v-model="refundlist.integralExchangeSill" placeholder clearable disabled />
         </el-form-item>
         <el-form-item label="补充描述和凭证" prop="refundReasonRemark">
           <el-input
             style="width: 300px"
             v-model="refundlist.refundReasonRemark"
-            placeholder=""
+            placeholder
             clearable
             type="textarea"
             :rows="5"
             disabled
           />
         </el-form-item>
-        <el-form-item> </el-form-item>
+        <el-form-item></el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="refundcancel">取 消</el-button>
@@ -641,42 +472,19 @@
       append-to-body
       :before-close="clicknurseStationshow"
     >
-      <el-form
-        ref="form"
-        :model="getListByUserquery"
-        label-width="110px"
-        :inline="true"
-      >
+      <el-form ref="form" :model="getListByUserquery" label-width="110px" :inline="true">
         <el-form-item label="护理站编码" prop="nurseStationCode">
-          <el-input
-            v-model="getListByUserquery.nurseStationCode"
-            placeholder="请输入护理站编码"
-          />
+          <el-input v-model="getListByUserquery.nurseStationCode" placeholder="请输入护理站编码" />
         </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input
-            v-model="getListByUserquery.nurseStationName"
-            placeholder="请输入护理站名称"
-          />
+          <el-input v-model="getListByUserquery.nurseStationName" placeholder="请输入护理站名称" />
         </el-form-item>
         <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="info"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="info">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="loading"
-        :data="nurseStationlist"
-        @cell-dblclick="choicestationid"
-      >
+      <el-table v-loading="loading" :data="nurseStationlist" @cell-dblclick="choicestationid">
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -692,31 +500,18 @@
               circle
               v-else
               @click="choicestationid(scope.row)"
-            >
-            </el-button>
+            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          property="nurseStationCode"
-          label="护理站编码"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="nurseStationName"
-          label="护理站名称"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column property="phone" label="联系电话" align="center">
-        </el-table-column>
+        <el-table-column property="nurseStationCode" label="护理站编码" align="center"></el-table-column>
+        <el-table-column property="nurseStationName" label="护理站名称" align="center"></el-table-column>
+        <el-table-column property="phone" label="联系电话" align="center"></el-table-column>
         <el-table-column
           property="address"
           label="护理站地址"
           align="center"
           :show-overflow-tooltip="true"
-        >
-        </el-table-column>
+        ></el-table-column>
       </el-table>
 
       <pagination
@@ -778,7 +573,7 @@
         >
         </el-table-column>
       </el-table>
-    </el-dialog> -->
+    </el-dialog>-->
   </div>
 </template>