Merge branch 'dev' into dev-g

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -1498,6 +1498,7 @@ public class OrderService {
         if (StringUtils.isNotBlank(dto.getStopReason())) {
             int i = Integer.parseInt(dto.getStopReason(), 16);
             String stopReasonMsg = YKCChargingStopReasonEnum.getMsgByCode(i);
+            record.setStopReasonCode(dto.getStopReason()); // 故障原因码
             record.setReason(stopReasonMsg);
         }
         record.setTradeDate(DateUtils.parseDate(dto.getTradeTime()));

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java

@@ -1259,7 +1259,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 			equipmentInfo.setNewNationalStandard(1);
 			equipmentInfo.setVinFlag(1);
 			equipmentInfo.setEquipmentName(pileSn);
-			equipmentInfo.setEquipmentApplication(1);
+			equipmentInfo.setEquipmentApplication(Constants.ONE);
 			equipmentInfo.setEquipmentInvestment(new BigDecimal("0.0"));
 			equipmentInfo.setProductSN(pileSn);
 			equipmentInfo.setOpenDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileDetailInfoVO.getCreateTime()));

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java

@@ -103,7 +103,7 @@ public class EquipmentInfo {
      * 9：其他
      */
     @JSONField(name = "EquipmentApplication")
-    private Integer equipmentApplication;
+    private String equipmentApplication;
 
     /**
      * 额定功率(单位：kW)  Y

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HeNanPlatformServiceImpl.java

@@ -9,23 +9,31 @@ import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
+import com.jsowell.common.enums.ykc.StartModeEnum;
 import com.jsowell.common.exception.BusinessException;
+import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.JWTUtils;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.AreaCodeInfo;
+import com.jsowell.pile.domain.OrderBasicInfo;
+import com.jsowell.pile.domain.OrderDetail;
 import com.jsowell.pile.dto.PushRealTimeInfoDTO;
 import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.pile.thirdparty.EquipmentInfo;
+import com.jsowell.pile.util.MerchantUtils;
 import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
 import com.jsowell.pile.vo.base.ConnectorInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
+import com.jsowell.pile.vo.web.PileMerchantInfoVO;
 import com.jsowell.thirdparty.lianlian.domain.*;
 import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
+import com.jsowell.thirdparty.platform.domain.ChargeOrderInfo;
+import com.jsowell.thirdparty.platform.domain.SupChargeDetails;
 import com.jsowell.thirdparty.platform.domain.SupStationInfo;
 import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
 import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
@@ -421,6 +429,64 @@ public class HeNanPlatformServiceImpl implements ThirdPartyPlatformService {
         return resultMap;
     }
 
+    /**
+     * 推送订单 notification_charge_order_info
+     * @param orderCode
+     * @param secretInfoVO
+     * @return
+     */
+    @Override
+    public String notificationChargeOrderInfo(String orderCode, ThirdPartySecretInfoVO secretInfoVO) {
+        // 根据订单号查询出信息
+        OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
+        if (orderBasicInfo == null) {
+            return null;
+        }
+
+        String operatorId = Constants.OPERATORID_JIANG_SU;
+        String operatorSecret = secretInfoVO.getTheirOperatorSecret();
+        String signSecret = secretInfoVO.getTheirSigSecret();
+        String dataSecret = secretInfoVO.getTheirDataSecret();
+        String dataSecretIv = secretInfoVO.getTheirDataSecretIv();
+        String urlAddress = secretInfoVO.getTheirUrlPrefix();
+
+        // 推送地址
+        String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_CHARGE_ORDER_INFO.getValue();
+
+        // 根据订单号查询订单详情
+        OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
+        if (orderDetail == null) {
+            return null;
+        }
+        // 拼装订单编号
+        String startChargeSeq = Constants.OPERATORID_JIANG_SU + orderCode + DateUtils.dateTimeNow(DateUtils.YYMMDD);
+        com.jsowell.thirdparty.platform.common.ChargeOrderInfo chargeOrderInfo = com.jsowell.thirdparty.platform.common.ChargeOrderInfo.builder()
+                .startChargeSeq(startChargeSeq)
+                // .startChargeType()
+                .connectorId(orderBasicInfo.getPileConnectorCode())
+                .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()))
+                .endTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeEndTime()))
+                .totalPower(orderDetail.getTotalUsedElectricity())
+                .totalElecMoney(orderDetail.getTotalElectricityAmount())
+                .totalSeviceMoney(orderDetail.getTotalServiceAmount())
+                .elecMoney(orderDetail.getTotalElectricityAmount())
+                .totalMoney(orderDetail.getTotalOrderAmount())
+                .stopReason(2)
+
+                .build();
+
+        // 获取令牌
+        String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);
+        if (StringUtils.isBlank(token)) {
+            return null;
+        }
+
+        // 调用平台接口
+        String jsonString = JSON.toJSONString(chargeOrderInfo);
+        String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret);
+        return result;
+    }
+
     /**
      * 查询河南省平台密钥信息
      * @return

jsowell-ui/src/views/financial/financeDetail-旧.vue

@@ -0,0 +1,554 @@
+<template>
+  <div class="app-container">
+    <div class="header-cont ">
+      <div class="header-txt">运营汇总</div>
+      <el-button type="primary" @click="goAccount">开户信息</el-button>
+    </div>
+    <div class="header" v-loading="loading">
+      <template v-if="operationStatus == null">
+        <div class="foot1">
+          <div style="margin: 12px 0">未查询到结算账户</div>
+        </div>
+      </template>
+      <template v-else>
+        <template v-if="showAccountList">
+          <div class="foot1" v-for="(item, index) in settleAccountList" :key="index">
+            <el-descriptions :column="1">
+              <el-descriptions-item label="运营商" class="remarks">
+                <span class="color">
+                  {{ merchant }}
+                </span>
+              </el-descriptions-item>
+              <el-descriptions-item label="商家性质">
+                <span class="color">{{
+                  merchantNature === "1" ? "对公" : "对私"
+                }}</span>
+              </el-descriptions-item>
+              <el-descriptions-item label="开户行名称">
+                <span class="color">{{ cityBankCode(item.bankCode) }}</span>
+              </el-descriptions-item>
+              <el-descriptions-item label="收款卡号">
+                <span class="color">{{ item.cardId }}</span>
+              </el-descriptions-item>
+              <el-descriptions-item label="预留手机">
+                <span class="color">{{ item.telNo }}</span>
+              </el-descriptions-item>
+            </el-descriptions>
+          </div>
+        </template>
+        <div class="foot1" v-else>
+          <el-descriptions :column="1">
+            <el-descriptions-item label="运营商">
+              <span class="color">
+                {{ merchant }}
+              </span>
+            </el-descriptions-item>
+            <el-descriptions-item label="商家性质">
+              <span class="color">{{
+                merchantNature === "1" ? "对公" : "对私"
+              }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="开户状态">
+              <span class="color">{{ adapayCorpMember.auditDesc }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="开户行名称">
+              <span class="color">{{
+                cityBankCode(adapayCorpMember.bankCode)
+              }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="收款卡号">
+              <span class="color">{{ adapayCorpMember.cardNo }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="预留手机">
+              <span class="color">{{ adapayCorpMember.legalMp }}</span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </template>
+      <div class="foot2">
+        <el-descriptions :column="1">
+          <el-descriptions-item label="总度数(度)">
+            <span class="color">
+              {{ merchantOrderReport.useElectricity }}
+            </span>
+          </el-descriptions-item>
+          <el-descriptions-item label="充电时长(分钟)">
+            <span class="color">{{ merchantOrderReport.chargeTime }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="电费金额(元)">
+            <span class="color">{{
+              merchantOrderReport.electricityAmount
+            }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="交易金额(元)">
+            <span class="color">{{ merchantOrderReport.tradeAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="虚拟金额(元)">
+            <span class="color">{{ merchantOrderReport.virtualAmount }}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div class="foot3">
+        <el-descriptions :column="1">
+          <el-descriptions-item label="充电次数(次)">
+            <span class="color">{{ merchantOrderReport.chargeNum }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="总结算金额(元)">
+            <span class="color">{{ merchantOrderReport.totalAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="服务费金额(元)">
+            <span class="color">{{ merchantOrderReport.serviceAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="交易手续费(元)">
+            <span class="color">{{ merchantOrderReport.tradeFee }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="白名单支付(次)">
+            <span class="color">{{
+              merchantOrderReport.whitelistPaymentsNum === null
+              ? "一"
+              : merchantOrderReport.whitelistPaymentsNum
+            }}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <template v-if="operationStatus == null">
+        <div class="foot4">未查询到运营商结算账户，提现功能现已关闭</div>
+      </template>
+      <template v-else>
+        <div class="margin-right foot4">
+          <div class="color60">可提现(元)</div>
+          <div class="margin-20 color">{{ adapayMember.avlBalance }}</div>
+          <el-button type="primary" v-if="adapayMember.avlBalance > withdrawalFee"
+            @click="dialogVisible = true">提现申请</el-button>
+          <div v-else>
+            <span class="text">该余额大于{{ withdrawalFee }}元时，才可发起取现</span>
+          </div>
+        </div>
+        <div class="margin-right foot4">
+          <div class="color60">总提现金额(元)</div>
+          <div class="margin-20 color" style="cursor: pointer;" @click="already">{{ adapayMember.totalWithdraw }}</div>
+          <div>
+            <span class="text">已成功提现到绑定银行卡的金额</span>
+          </div>
+        </div>
+      </template>
+    </div>
+    <hr />
+    <div class="center">
+      <div class="header-txt">运营分析</div>
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
+        <el-form-item label="日期" prop="tradeDate">
+          <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd"
+            :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" :clearable="false"></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <hr />
+    <el-table :data="reportList">
+      <el-table-column label="日期" align="center" prop="tradeDate" />
+
+      <el-table-column label="账单状态" align="center" prop="billStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
+      <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
+      <el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
+      <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
+      <el-table-column label="提现申请时间" align="center" prop="applicationTime" />
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum"
+      :limit.sync="reportQueryParams.pageSize" @pagination="getList" />
+    <!-- 提现申请弹窗 -->
+    <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%">
+      温馨提示
+      <div style="font-size: 12px; color: gray">
+        <p>1.提现将在3个工作日内审核到账,节假日审核顺延</p>
+        <p>2.部分流量方的充电订单存在账期,需要一定周期后才开始执行清分</p>
+        <p>3.提现为银行自动付款,根据银行要求会收取手续费,请知悉</p>
+      </div>
+      <p>
+        可提现（元）：
+        <span class="number color">{{ adapayMember.avlBalance }}</span>
+      </p>
+      <p>
+        手续费（元）：
+        <span class="number color">{{ withdrawalFee.toFixed(2) }}</span>
+      </p>
+      <p>
+        实际到账（元）：
+        <span class="number color">
+          {{ adapayMember.avlBalance - withdrawalFee }}
+        </span>
+      </p>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit">提交</el-button>
+      </span>
+    </el-dialog>
+    <!-- 提现记录 -->
+    <el-dialog title="提现记录" :visible.sync="recordDialog">
+      <el-table :data="payoutInformation" style="width: 100%">
+        <el-table-column label="申请时间" align="center" property="applicationTime" />
+        <el-table-column label="提现编号" align="center" property="withdrawCode" />
+        <el-table-column label="状态" align="center" property="statusDesc" />
+        <el-table-column label="金额" align="center" property="cashAmt" />
+      </el-table>
+      <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="getWithdrawnParameters.pageNum"
+        :limit.sync="getWithdrawnParameters.pageSize" @pagination="getHistory" />
+    </el-dialog>
+    <!-- 订单流水 -->
+    <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
+      <el-table :data="orderList" v-loading="orderLoading">
+        <el-table-column property="orderCode" label="订单编号" align="center" />
+        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
+        <el-table-column property="clearingStatus" label="清分状态" align="center"/>
+        <el-table-column property="clearingBillCode" label="清分账单编号" align="center" />
+        <el-table-column property="withdrawStatus" label="提现状态" align="center" />
+        <el-table-column property="withdrawCode" label="提现编号" align="center" />
+      </el-table>
+      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
+        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getMerchantOrderReport,
+  withdraw,
+  selectAdapayMember,
+  queryAdapayAccountBalance,
+  WithdrawalHistory
+} from "@/api/adapayMember/adapayMember";
+import { getOrderReportDetail } from "@/api/order/order";
+import { getDay } from "@/utils/common";
+import text from "@/assets/json/bank_code.json";
+
+export default {
+  dicts: ["bill_status"],
+  data() {
+    return {
+      orderLoading: true,
+      loading: true,
+      operationStatus: null,
+      adapayMember: {},
+      // 开启
+      recordDialog: false,
+      tableData: [],
+      merchant: this.$route.query.merchantName,
+      orderTotal: 0,
+      getOrderParams: {
+        pageNum: 1,
+        pageSize: 10,
+        merchantId: null,
+        tradeDate: null,
+      },
+      orderList: [],
+      dialogTableVisible: false,
+      dialogVisible: false,
+      withdrawalFee: 5,
+      reportTotal: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      merchantId: this.$route.query.merchantId,
+      createTimeRange: [],
+      reportList: [],
+      reportQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        merchantId: this.$route.query.merchantId,
+        startTime: "",
+        endTime: "",
+      },
+      bankName: "",
+      merchantOrderReport: {},
+      adapayCorpMember: {},
+      settleAccountList: [],
+      merchantNature: "",
+      showAdapayCorp: "",
+      showAccountList: false,
+      //已提现参数
+      getWithdrawnParameters: {
+        merchantId: this.$route.query.merchantId,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      payoutInformation: [],
+      getTotal: 0
+    };
+  },
+  methods: {
+    // 银行编码
+    cityBankCode(code) {
+      if (code == null) {
+        return "";
+      }
+      const bankList = text.bankList;
+      let arr = bankList.find((item) => item.bankCode === code);
+      if (arr.bankName != null) {
+        this.bankName = arr.bankName;
+      }
+      return this.bankName;
+    },
+    selectAdapayMember() {
+      console.log("this.merchantId", this.merchantId);
+      // this.loading = true;
+      let param = {
+        merchantId: this.merchantId,
+      };
+      selectAdapayMember(param).then((response) => {
+        console.log("查询结算账户", response);
+        this.operationStatus = response.data;
+        this.loading = false;
+        // console.log("this.operationStatus", this.operationStatus.bankAcctType);
+        // 商家性质：
+        if (response.data != null) {
+          // 对公返回的结果 商家性质：
+          this.merchantNature = this.operationStatus.bankAcctType;
+          console.log("对公信息", this.adapayCorpMember);
+          if (response.data.settleAccountList != null) {
+            // 个人账户
+            this.adapayCorpMember = response.data.adapayMember;
+            this.settleAccountList = response.data.settleAccountList;
+            this.showAccountList = true;
+          }
+          this.showAdapayCorp = response.data.adapayCorpMember;
+          if (response.data.adapayCorpMember != null)
+            return (this.adapayCorpMember = response.data.adapayCorpMember);
+        }
+        this.loading = false;
+      });
+    },
+    getAdapayBalance() {
+      let param = {
+        merchantId: this.merchantId,
+      };
+      queryAdapayAccountBalance(param).then((response) => {
+        console.log("查询 可提现金额 queryAdapayAccountBalance", response);
+        this.adapayMember = response.data;
+      });
+    },
+    // 订单流水请求
+    getOrderList() {
+      this.orderLoading = true;
+      console.log("this.getOrderParams", this.getOrderParams);
+      getOrderReportDetail(this.getOrderParams).then((res) => {
+        console.log("获取订单列表res", res);
+        this.orderList = res.rows;
+        this.orderTotal = res.total;
+        this.orderLoading = false;
+      });
+    },
+    // 弹层关闭之前执行的事情
+    orderClose() {
+      this.dialogTableVisible = false;
+      this.getOrderParams.pageNum = 1;
+      this.orderList = [];
+      this.orderTotal = 0;
+    },
+    // 订单流水按钮
+    goTradeDate(scope) {
+      // console.log("点击日期出现弹层", scope);
+      if (scope.row.tradeDate === null)
+        return this.$message.info("此条数据暂不显示订单流水");
+      // console.log("点击日期出现弹层", scope.row.tradeDate);
+      this.dialogTableVisible = true;
+      this.getOrderParams.merchantId = scope.row.merchantId;
+      this.getOrderParams.tradeDate = scope.row.tradeDate;
+      this.getOrderList();
+    },
+    getList() {
+      console.log("queryParams", this.queryParams);
+      getMerchantOrderReport(this.reportQueryParams).then((response) => {
+        console.log("getMerchantOrderReport", response);
+        if (response.data) {
+          this.merchantOrderReport = response.data.merchantOrderReport;
+          if (response.data.pageResponse === null)
+            return (this.reportList = []);
+          this.reportList = response.data.pageResponse.list;
+          this.reportTotal = response.data.pageResponse.total;
+        } else {
+          this.reportList = [];
+          this.merchantOrderReport = null;
+        }
+      });
+    },
+    handleClose() {
+      this.$confirm("确认提交？")
+        .then((_) => {
+          let params = {
+            merchantId: this.merchantId,
+            cashAmt: this.adapayMember.avlBalance,
+          };
+          console.log("点击提交按钮之前执行 params", params);
+          withdraw(params).then((response) => {
+            console.log("res 提现金额", response);
+            if (response.code !== 200)
+              return this.$modal.msgError(response.msg);
+            this.$modal.msgSuccess("操作成功");
+            // 重新查询当前 显示的可提现金额
+            this.getAdapayBalance();
+          });
+          this.dialogVisible = false;
+        })
+        .catch((_) => { });
+    },
+    // 点击提交按钮
+    submit() {
+      this.handleClose();
+    },
+    withdrawalClick() {
+      // this.$router.push({
+      //   name: "withdrawalRecords",
+      // });
+    },
+    goAccount() {
+      this.$router.push({
+        name: "accountUserInfo",
+        params: {
+          id: this.merchantId,
+        },
+      });
+    },
+    // 点击搜索按钮
+    handleQuery() {
+      let arr = this.createTimeRange[0];
+      let str = this.createTimeRange[1];
+      console.log("点击搜索时展示的日期数据", arr, str);
+      this.reportQueryParams.startTime = arr;
+      this.reportQueryParams.endTime = str;
+      this.reportQueryParams.pageNum = 1;
+      this.reportTotal = 0;
+      this.getList();
+    },
+    defaultDate() {
+      //字符串拼接，开始时间，结束时间
+      let beg = getDay(-30); //当月第一天
+      let end = getDay(0); //当天
+      this.createTimeRange = [beg, end];
+      // console.log("this.createTimeRange", this.createTimeRange);
+      // return this.createTimeRange;
+      this.reportQueryParams.startTime = beg;
+      this.reportQueryParams.endTime = end;
+      this.getList();
+    },
+    already() {
+      this.recordDialog = true;
+      this.getHistory()
+    },
+    //提现记录
+    getHistory() {
+      console.log('etWithdrawnParameters', this.getWithdrawnParameters);
+      WithdrawalHistory(this.getWithdrawnParameters).then((response) => {
+        console.log("提现记录", response);
+        this.payoutInformation = response.data.list;
+        this.getTotal = response.data.total;
+      });
+    }
+  },
+  created() {
+    this.defaultDate();
+    this.getAdapayBalance();
+    this.selectAdapayMember();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.color60 {
+  color: #606266;
+}
+
+.center {
+  display: flex;
+  align-content: center;
+  margin-top: 30px;
+}
+
+.margin-20 {
+  margin: 20px 0;
+  font-size: 20px;
+}
+
+.font-13 {
+  font-size: 13px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+}
+
+.header-cont {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.header-txt {
+  font-size: 24px;
+}
+
+.text {
+  font-size: 12px;
+  color: red;
+}
+
+.foot1 {
+  width: 20%;
+  margin-top: 10px;
+
+  ::v-deep .el-descriptions-item__label {
+    width: 80px;
+    margin-right: 0;
+  }
+}
+
+.foot2 {
+  margin-left: 10px;
+  margin-right: 10px;
+  width: 450px;
+
+  ::v-deep .el-descriptions-item__label {
+    width: 105px;
+    margin-right: 0;
+  }
+}
+
+.foot3 {
+  width: 400px;
+  margin-right: 10px;
+
+  ::v-deep .el-descriptions-item__label {
+    width: 108px;
+    margin-right: 0;
+  }
+}
+
+.foot4 {
+  display: inline-block;
+}
+
+.margin-right {
+  width: 500px;
+  // margin-right: 50px;
+  text-align: center;
+}
+
+.color {
+  color: #000;
+  font-weight: bolder;
+}
+</style>

jsowell-ui/src/views/financial/financeDetail.vue

@@ -1,201 +1,150 @@
 <template>
-  <div class="app-container">
+  <div class="wp">
-    <div class="header-cont ">
+    <div class="header">
-      <div class="header-txt">运营汇总</div>
+      <div class="text-gray" v-if="showAccountList" v-for="(item, index) in settleAccountList" :key="index"  >
-      <el-button type="primary" @click="goAccount">开户信息</el-button>
+        <h3>运营商信息</h3>
-    </div>
+        <div>
-    <div class="header" v-loading="loading">
+          <p>运营商：</p>
-      <template v-if="operationStatus == null">
+          <span>{{ merchant }}</span>
-        <div class="foot1">
-          <div style="margin: 12px 0">未查询到结算账户</div>
         </div>
-      </template>
+        <div>
-      <template v-else>
+          <p>商家性质：</p>
-        <template v-if="showAccountList">
+          <span>{{ merchantNature === "1" ? "对公" : "对私" }}</span>
-          <div class="foot1" v-for="(item, index) in settleAccountList" :key="index">
+        </div>
-            <el-descriptions :column="1">
+        <div>
-              <el-descriptions-item label="运营商" class="remarks">
+          <p>开户行名称：</p>
-                <span class="color">
+          <span>{{ cityBankCode(item.bankCode) }}</span>
-                  {{ merchant }}
+        </div>
-                </span>
+        <div>
-              </el-descriptions-item>
+          <p>收款卡号：</p>
-              <el-descriptions-item label="商家性质">
+          <span>{{ item.cardId }}</span>
-                <span class="color">{{
+        </div>
-                  merchantNature === "1" ? "对公" : "对私"
+        <div>
-                }}</span>
+          <p>预留手机号：</p>
-              </el-descriptions-item>
+          <span>{{ item.telNo }}</span>
-              <el-descriptions-item label="开户行名称">
-                <span class="color">{{ cityBankCode(item.bankCode) }}</span>
-              </el-descriptions-item>
-              <el-descriptions-item label="收款卡号">
-                <span class="color">{{ item.cardId }}</span>
-              </el-descriptions-item>
-              <el-descriptions-item label="预留手机">
-                <span class="color">{{ item.telNo }}</span>
-              </el-descriptions-item>
-            </el-descriptions>
-          </div>
-        </template>
-        <div class="foot1" v-else>
-          <el-descriptions :column="1">
-            <el-descriptions-item label="运营商">
-              <span class="color">
-                {{ merchant }}
-              </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="商家性质">
-              <span class="color">{{
-                merchantNature === "1" ? "对公" : "对私"
-              }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="开户状态">
-              <span class="color">{{ adapayCorpMember.auditDesc }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="开户行名称">
-              <span class="color">{{
-                cityBankCode(adapayCorpMember.bankCode)
-              }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="收款卡号">
-              <span class="color">{{ adapayCorpMember.cardNo }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="预留手机">
-              <span class="color">{{ adapayCorpMember.legalMp }}</span>
-            </el-descriptions-item>
-          </el-descriptions>
         </div>
-      </template>
-      <div class="foot2">
-        <el-descriptions :column="1">
-          <el-descriptions-item label="总度数(度)">
-            <span class="color">
-              {{ merchantOrderReport.useElectricity }}
-            </span>
-          </el-descriptions-item>
-          <el-descriptions-item label="充电时长(分钟)">
-            <span class="color">{{ merchantOrderReport.chargeTime }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="电费金额(元)">
-            <span class="color">{{
-              merchantOrderReport.electricityAmount
-            }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="交易金额(元)">
-            <span class="color">{{ merchantOrderReport.tradeAmount }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="虚拟金额(元)">
-            <span class="color">{{ merchantOrderReport.virtualAmount }}</span>
-          </el-descriptions-item>
-        </el-descriptions>
       </div>
-      <div class="foot3">
+      <div class="text-gray" v-else>
-        <el-descriptions :column="1">
+        <h3>运营商信息</h3>
-          <el-descriptions-item label="充电次数(次)">
+        <div>
-            <span class="color">{{ merchantOrderReport.chargeNum }}</span>
+          <p>运营商：</p>
-          </el-descriptions-item>
+          <span>{{ merchant }}</span>
-          <el-descriptions-item label="总结算金额(元)">
+        </div>
-            <span class="color">{{ merchantOrderReport.totalAmount }}</span>
+        <div>
-          </el-descriptions-item>
+          <p>商家性质：</p>
-          <el-descriptions-item label="服务费金额(元)">
+          <span>{{ merchantNature === "1" ? "对公" : "对私" }}</span>
-            <span class="color">{{ merchantOrderReport.serviceAmount }}</span>
+        </div>
-          </el-descriptions-item>
+        <div>
-          <el-descriptions-item label="交易手续费(元)">
+          <p>开户行名称：</p>
-            <span class="color">{{ merchantOrderReport.tradeFee }}</span>
+          <span>{{ cityBankCode(adapayCorpMember.bankCode) }}</span>
-          </el-descriptions-item>
+        </div>
-          <el-descriptions-item label="白名单支付(次)">
+        <div>
-            <span class="color">{{
+          <p>收款卡号：</p>
-              merchantOrderReport.whitelistPaymentsNum === null
+          <span>{{ adapayCorpMember.cardNo }}</span>
-              ? "一"
+        </div>
-              : merchantOrderReport.whitelistPaymentsNum
+        <div>
-            }}</span>
+          <p>预留手机号：</p>
-          </el-descriptions-item>
+          <span>{{ adapayCorpMember.legalMp }}</span>
-        </el-descriptions>
+        </div>
       </div>
-      <template v-if="operationStatus == null">
+      <div class="text-gray">
-        <div class="foot4">未查询到运营商结算账户，提现功能现已关闭</div>
+        <h3>分润数据</h3>
-      </template>
+        <div>
-      <template v-else>
+          <p>参与分润金额：</p>
-        <div class="margin-right foot4">
+          <span style="color: #2563eb">¥ 153,426.82</span>
-          <div class="color60">可提现(元)</div>
-          <div class="margin-20 color">{{ adapayMember.avlBalance }}</div>
-          <el-button type="primary" v-if="adapayMember.avlBalance > withdrawalFee"
-            @click="dialogVisible = true">提现申请</el-button>
-          <div v-else>
-            <span class="text">该余额大于{{ withdrawalFee }}元时，才可发起取现</span>
-          </div>
         </div>
-        <div class="margin-right foot4">
+        <div>
-          <div class="color60">总提现金额(元)</div>
+          <p>分出总金额：</p>
-          <div class="margin-20 color" style="cursor: pointer;" @click="already">{{ adapayMember.totalWithdraw }}</div>
+          <span style="color: #16a34a">¥ 98,142.35</span>
-          <div>
-            <span class="text">已成功提现到绑定银行卡的金额</span>
-          </div>
         </div>
-      </template>
+        <div>
+          <p>分润订单数：</p>
+          <span>286笔</span>
+        </div>
+      </div>
+      <div class="text-gray">
+        <h3>金额信息</h3>
+        <div>
+          <p>电费金额：</p>
+          <span>¥ {{ merchantOrderReport.electricityAmount ? merchantOrderReport.electricityAmount.toFixed(2) : '0.00'}}</span>
+        </div>
+        <div>
+          <p>交易金额：</p>
+          <span>¥ {{ merchantOrderReport.tradeAmount? merchantOrderReport.tradeAmount.toFixed(2) : '0.00'}}</span>
+        </div>
+        <div>
+          <p>虚拟金额：</p>
+          <span>¥ {{merchantOrderReport.virtualAmount? merchantOrderReport.virtualAmount.toFixed(2): '0.00' }}</span>
+        </div>
+        <div>
+          <p>服务费金额：</p>
+          <span>¥ {{ merchantOrderReport.serviceAmount?merchantOrderReport.serviceAmount.toFixed(2) : '0.00'}}</span>
+        </div>
+        <div>
+          <p>交易手续费：</p>
+          <span>¥ {{merchantOrderReport.tradeFee? merchantOrderReport.tradeFee.toFixed(2): '0.00' }}</span>
+        </div>
+      </div>
+      <div class="text-gray">
+        <h3>提现信息</h3>
+        <div>
+          <p>总结算金额：</p>
+          <span>¥ {{ merchantOrderReport.totalAmount?merchantOrderReport.totalAmount.toFixed(2): '0.00' }}</span>
+        </div>
+        <div>
+          <p>可提现金额：</p>
+          <span style="color: #2563eb">¥ {{ adapayMember.avlBalance?adapayMember.avlBalance.toFixed(2) : '0.00'}}</span>
+        </div>
+        <div>
+          <p>总提现金额：</p>
+          <span style="color: #16a34a">
+            ¥ {{ adapayMember.totalWithdraw?adapayMember.totalWithdraw.toFixed(2) : '0.00'}}
+          </span>
+        </div>
+        <p class="concentrate">已成功提现到绑定银行卡的金额</p>
+      </div>
     </div>
-    <hr />
+    <div class="inquire">
-    <div class="center">
+      <el-form  :model="queryParams" ref="queryForm" size="small" inline  label-width="68px" >
-      <div class="header-txt">运营分析</div>
-      <el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
         <el-form-item label="日期" prop="tradeDate">
-          <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd"
+          <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期" :clearable="false" ></el-date-picker>
-            :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" :clearable="false"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         </el-form-item>
       </el-form>
+      <el-form>
+        <el-form-item>
+          <el-button style="height: 40px" type="success" icon="el-icon-s-claim" @click="already">提现记录</el-button  >
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="container">
+      <!-- <el-table :data="reportList"> -->
+      <el-table :data="temporary">
+        <el-table-column label="日期" align="center" prop="tradeDate" />
+        <el-table-column label="账单状态" align="center" prop="billStatus">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
+        <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
+        <el-table-column label="交易手续费（元）" align="center" prop="feeAmount"/>
+        <el-table-column label="分润金额（元）" align="center" prop="aaa" />
+        <el-table-column label="实际到账金额（元）" align="center" prop="bbb" />
+        <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
+        <el-table-column label="提现申请时间" align="center" prop="applicationTime" />
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
+            <span class="link-type" style="margin-left: 10px" @click="getProfitSharing(scope)">分润流水</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum" :limit.sync="reportQueryParams.pageSize"
+        @pagination="getList" />
     </div>
-    <hr />
-    <el-table :data="reportList">
-      <el-table-column label="日期" align="center" prop="tradeDate" />
-
-      <el-table-column label="账单状态" align="center" prop="billStatus">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
-      <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
-      <el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
-      <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
-      <el-table-column label="提现申请时间" align="center" prop="applicationTime" />
-      <el-table-column label="操作" align="center">
-        <template slot-scope="scope">
-          <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum"
-      :limit.sync="reportQueryParams.pageSize" @pagination="getList" />
-    <!-- 提现申请弹窗 -->
-    <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%">
-      温馨提示
-      <div style="font-size: 12px; color: gray">
-        <p>1.提现将在3个工作日内审核到账,节假日审核顺延</p>
-        <p>2.部分流量方的充电订单存在账期,需要一定周期后才开始执行清分</p>
-        <p>3.提现为银行自动付款,根据银行要求会收取手续费,请知悉</p>
-      </div>
-      <p>
-        可提现（元）：
-        <span class="number color">{{ adapayMember.avlBalance }}</span>
-      </p>
-      <p>
-        手续费（元）：
-        <span class="number color">{{ withdrawalFee.toFixed(2) }}</span>
-      </p>
-      <p>
-        实际到账（元）：
-        <span class="number color">
-          {{ adapayMember.avlBalance - withdrawalFee }}
-        </span>
-      </p>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submit">提交</el-button>
-      </span>
-    </el-dialog>
     <!-- 提现记录 -->
     <el-dialog title="提现记录" :visible.sync="recordDialog">
       <el-table :data="payoutInformation" style="width: 100%">
@@ -204,21 +153,42 @@
         <el-table-column label="状态" align="center" property="statusDesc" />
         <el-table-column label="金额" align="center" property="cashAmt" />
       </el-table>
-      <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="getWithdrawnParameters.pageNum"
+      <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="getWithdrawnParameters.pageNum" :limit.sync="getWithdrawnParameters.pageSize"  @pagination="getHistory"/>
-        :limit.sync="getWithdrawnParameters.pageSize" @pagination="getHistory" />
     </el-dialog>
     <!-- 订单流水 -->
-    <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
+    <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose" >
       <el-table :data="orderList" v-loading="orderLoading">
         <el-table-column property="orderCode" label="订单编号" align="center" />
         <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
-        <el-table-column property="clearingStatus" label="清分状态" align="center"/>
+        <el-table-column property="clearingStatus" label="清分状态" align="center" />
-        <el-table-column property="clearingBillCode" label="清分账单编号" align="center" />
+        <el-table-column property="clearingBillCode" label="清分账单编号" align="center"/>
         <el-table-column property="withdrawStatus" label="提现状态" align="center" />
         <el-table-column property="withdrawCode" label="提现编号" align="center" />
       </el-table>
-      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
+      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum" :limit.sync="getOrderParams.pageSize" @pagination="getOrderList"/>
-        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
+    </el-dialog>
+    <!-- 分润流水 -->
+    <el-dialog  title="分润流水" :visible.sync="profitSharing" :before-close="turnOffProfitSharing" >
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
+        <el-form-item label="分润类型" prop="tradeDate">
+          <el-select v-model="queryParams.orderStatus" placeholder="请选择分润类型" clearable style="width: 180px"  >
+            <el-option  v-for="item1 in sharingType" :key="item1.value" :label="item1.label" :value="item1.value"/>
+          </el-select>
+        </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="">重置</el-button>
+          <el-button type="warning" plain icon="el-icon-download" size="mini" @click=" ">导出</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="orderList">
+        <el-table-column property="orderCode" label="订单编号" align="center" />
+        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
+        <el-table-column property="" label="分润类型" align="center" />
+        <el-table-column property="" label="分润比例" align="center" />
+        <el-table-column property="" label="分润金额(元)" align="center" />
+      </el-table>
+      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum" :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
     </el-dialog>
   </div>
 </template>
@@ -228,7 +198,7 @@ import {
   withdraw,
   selectAdapayMember,
   queryAdapayAccountBalance,
-  WithdrawalHistory
+  WithdrawalHistory,
 } from "@/api/adapayMember/adapayMember";
 import { getOrderReportDetail } from "@/api/order/order";
 import { getDay } from "@/utils/common";
@@ -286,7 +256,25 @@ export default {
         pageSize: 10,
       },
       payoutInformation: [],
-      getTotal: 0
+      getTotal: 0,
+      profitSharing: false,
+      temporary: [
+        {
+          tradeDate: "2025-02-18",
+          billStatus: "提现申请中",
+          receivableAmount: "313.92",
+          withdrawAbleAmount: "1371.99",
+          feeAmount: "1.83",
+          aaa: "1059.92",
+          bbb: "1059.92",
+          withdrawCode: "0021110738083352290123776",
+          applicationTime: "2025-02-19 08:31:00",
+        },
+      ],
+      sharingType: [
+        { label: "直接分润", value: "1" },
+        { label: "间接分润", value: "2" },
+      ],
     };
   },
   methods: {
@@ -375,8 +363,7 @@ export default {
         console.log("getMerchantOrderReport", response);
         if (response.data) {
           this.merchantOrderReport = response.data.merchantOrderReport;
-          if (response.data.pageResponse === null)
+          if (response.data.pageResponse === null) return (this.reportList = []);
-            return (this.reportList = []);
           this.reportList = response.data.pageResponse.list;
           this.reportTotal = response.data.pageResponse.total;
         } else {
@@ -395,15 +382,14 @@ export default {
           console.log("点击提交按钮之前执行 params", params);
           withdraw(params).then((response) => {
             console.log("res 提现金额", response);
-            if (response.code !== 200)
+            if (response.code !== 200) return this.$modal.msgError(response.msg);
-              return this.$modal.msgError(response.msg);
             this.$modal.msgSuccess("操作成功");
             // 重新查询当前 显示的可提现金额
             this.getAdapayBalance();
           });
           this.dialogVisible = false;
         })
-        .catch((_) => { });
+        .catch((_) => {});
     },
     // 点击提交按钮
     submit() {
@@ -446,17 +432,28 @@ export default {
     },
     already() {
       this.recordDialog = true;
-      this.getHistory()
+      this.getHistory();
     },
     //提现记录
     getHistory() {
-      console.log('etWithdrawnParameters', this.getWithdrawnParameters);
+      console.log("etWithdrawnParameters", this.getWithdrawnParameters);
       WithdrawalHistory(this.getWithdrawnParameters).then((response) => {
         console.log("提现记录", response);
         this.payoutInformation = response.data.list;
         this.getTotal = response.data.total;
       });
-    }
+    },
+    // 分润流水弹框
+    getProfitSharing(scope) {
+      console.log("点击分润流水", scope);
+      this.profitSharing = true;
+    },
+    // 关闭分润流水弹框
+    turnOffProfitSharing() {
+      this.profitSharing = false;
+      this.orderList = [];
+			this.queryParams = {};
+    },
   },
   created() {
     this.defaultDate();
@@ -467,88 +464,69 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.color60 {
+.wp {
-  color: #606266;
+  background: #f3f3f3;
-}
+  padding: 20px;
-
+  min-height: 100vh;
-.center {
-  display: flex;
-  align-content: center;
-  margin-top: 30px;
-}
-
-.margin-20 {
-  margin: 20px 0;
-  font-size: 20px;
-}
-
-.font-13 {
-  font-size: 13px;
 }
 
 .header {
   display: flex;
   align-items: center;
-}
-
-.header-cont {
-  display: flex;
   justify-content: space-between;
+  width: 100%;
+  height: 240px;
+
+  h3 {
+    margin: 0px;
+    margin-bottom: 10px;
+  }
+
+  .text-gray {
+    width: 24.5%;
+    height: 100%;
+    background: #fff;
+    border-radius: 8px;
+    box-shadow: 0 3px 2px rgba(0, 0, 0, 0.15);
+    padding: 20px;
+
+    div {
+      height: 35px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      p {
+        color: #666;
+        font-size: 15px;
+      }
+
+      span {
+        display: block;
+        color: #333;
+        font-size: 16px;
+      }
+    }
+
+    .concentrate {
+      color: #666;
+      font-size: 15px;
+    }
+  }
+}
+
+.inquire {
+  padding: 20px 20px 0 20px;
+  background: #fff;
+  margin-top: 20px;
+  display: flex;
   align-items: center;
+  justify-content: space-between;
 }
 
-.header-txt {
+.container {
-  font-size: 24px;
+  padding: 20px;
-}
+  background: #fff;
-
+  margin-top: 20px;
-.text {
-  font-size: 12px;
-  color: red;
-}
-
-.foot1 {
-  width: 20%;
-  margin-top: 10px;
-
-  ::v-deep .el-descriptions-item__label {
-    width: 80px;
-    margin-right: 0;
-  }
-}
-
-.foot2 {
-  margin-left: 10px;
-  margin-right: 10px;
-  width: 450px;
-
-  ::v-deep .el-descriptions-item__label {
-    width: 105px;
-    margin-right: 0;
-  }
-}
-
-.foot3 {
-  width: 400px;
-  margin-right: 10px;
-
-  ::v-deep .el-descriptions-item__label {
-    width: 108px;
-    margin-right: 0;
-  }
-}
-
-.foot4 {
-  display: inline-block;
-}
-
-.margin-right {
-  width: 500px;
-  // margin-right: 50px;
-  text-align: center;
-}
-
-.color {
-  color: #000;
-  font-weight: bolder;
 }
 </style>

jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue

@@ -26,6 +26,11 @@
         <el-table-column prop="name" label="固件名称"></el-table-column>
         <el-table-column prop="description" label="固件描述"></el-table-column>
         <el-table-column prop="filePath" label="路径"></el-table-column>
+        <el-table-column prop="useRange" label="固件类型">
+          <template slot-scope="scope">
+            <span>{{ scope.row.useRange == 2 ? '蓝牙':'4G' }}</span>
+          </template>
+        </el-table-column>   
       </el-table>
       <pagination
         v-show="total > 0"

jsowell-ui/vue.config.js

@@ -35,10 +35,12 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        // target: `http://localhost:8080`,
         // 更改代理为本地地址
-        // target: `http://192.168.2.6:8080`,
+       // target: `http://106.14.94.149:8080`,
-        // target: `https://api.jsowellcloud.com`,
+      //  target: `http://192.168.2.21:8080`,
+       // target: `https://api.jsowellcloud.com`,
+       target: `https://apitest.jsowellcloud.com`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",