diff --git a/yunze-admin/src/main/resources/application-druid.yml b/yunze-admin/src/main/resources/application-druid.yml
index 890f3ad..8ea62c6 100644
--- a/yunze-admin/src/main/resources/application-druid.yml
+++ b/yunze-admin/src/main/resources/application-druid.yml
@@ -8,9 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://127.0.0.1:3306/demo_iotdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: iotdb
-#                username: demo_user
                 password: www.5iot.cn
-#                password: Fr#3@4!PpL&58Vc6
 
 
             #从库数据源
diff --git a/yunze-common/src/main/java/com/yunze/common/mapper/yunze/YzCardFlowMapper.java b/yunze-common/src/main/java/com/yunze/common/mapper/yunze/YzCardFlowMapper.java
index c29b3ee..b651361 100644
--- a/yunze-common/src/main/java/com/yunze/common/mapper/yunze/YzCardFlowMapper.java
+++ b/yunze-common/src/main/java/com/yunze/common/mapper/yunze/YzCardFlowMapper.java
@@ -254,4 +254,6 @@ public interface YzCardFlowMapper
     void insertFlow(Map<String, Object> insertMap);
 
     Integer filterIsAddPackage(String iccid);
+
+    int selOneCardFlow(String iccid);
 }
diff --git a/yunze-common/src/main/resources/mapper/quartz/yunze/YzCardFlowMapper.xml b/yunze-common/src/main/resources/mapper/quartz/yunze/YzCardFlowMapper.xml
index 854a87f..ffa3c8b 100644
--- a/yunze-common/src/main/resources/mapper/quartz/yunze/YzCardFlowMapper.xml
+++ b/yunze-common/src/main/resources/mapper/quartz/yunze/YzCardFlowMapper.xml
@@ -805,4 +805,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			iccid = #{iccid}
 		  AND validate_type = "0"
 	</select>
+	<select id="selOneCardFlow" resultType="java.lang.Integer">
+		SELECT
+			count(0) AS total
+		FROM
+			yz_card_flow
+		WHERE
+			iccid = #{iccid}
+		  AND validate_type = "0"
+	</select>
 </mapper>
diff --git a/yunze-system/src/main/java/com/yunze/system/service/impl/yunze/YzCardServiceImpl.java b/yunze-system/src/main/java/com/yunze/system/service/impl/yunze/YzCardServiceImpl.java
index 8e31bc8..c26827c 100644
--- a/yunze-system/src/main/java/com/yunze/system/service/impl/yunze/YzCardServiceImpl.java
+++ b/yunze-system/src/main/java/com/yunze/system/service/impl/yunze/YzCardServiceImpl.java
@@ -1702,7 +1702,7 @@ public class YzCardServiceImpl implements IYzCardService {
             if (list.size() > 0) {
                 for (Map<String, String> stringMap : list) {
                     //判断该卡是否订购过当月套餐
-                    int total = cardFlowMapper.selCardFlow(stringMap);
+                    int total = cardFlowMapper.selOneCardFlow(stringMap.get("iccid").toString());
                     if (total == 0) {
                         if (!stringMap.get("iccid").equals("")) {
                             //1、根据iccid获取卡信息、资费信息
@@ -1721,6 +1721,42 @@ public class YzCardServiceImpl implements IYzCardService {
         return AjaxResult.success("添加成功 !");
     }
 
+    public AjaxResult trafficImportText(Map<String, Object> map) {
+        String iccid = map.get("iccid").toString();
+        if (iccid.contains("\n")) {
+            String iccidArr = iccid.replace("\n", ",");
+            String idsArr[] = iccidArr.split(",");
+            if (idsArr.length > 500) {
+                return AjaxResult.error("订购卡总数大于500张,请调整后重试 ！");
+            }
+            for (String s : idsArr) {
+                Map<String, String> stringMap = new HashMap<>();
+                stringMap.put("iccid", s);
+                //判断该卡是否订购过当月套餐
+                int total = cardFlowMapper.selOneCardFlow(stringMap.get("iccid").toString());
+                if (total == 0) {
+                    //获取卡信息
+                    Map<String, Object> cardInfoMap = yzCardMapper.selOneCardInfo(stringMap);
+                    Map<String, Object> packageInfo = packetMapper.findPackageInfo(map);
+                    //2、根据卡信息生成订单 变更执行类型
+                    this.saveOrderInfo(cardInfoMap, packageInfo);
+                }
+            }
+        } else {
+            //判断该卡是否订购过当月套餐
+            int total = cardFlowMapper.selOneCardFlow(iccid);
+            if (total == 0) {
+                Map<String, String> stringMap = new HashMap<>();
+                stringMap.put("iccid", iccid);
+                Map<String, Object> cardInfoMap = yzCardMapper.selOneCardInfo(stringMap);
+                Map<String, Object> packageInfo = packetMapper.findPackageInfo(map);
+                //2、根据卡信息生成订单 变更执行类型
+                this.saveOrderInfo(cardInfoMap, packageInfo);
+            }
+        }
+        return AjaxResult.success();
+    }
+
     private void saveOrderInfo(Map<String, Object> cardInfoMap, Map<String, Object> packageInfo) {
         HashMap<String, Object> insertMap = new HashMap<>();
         String ord_no = VeDate.getNo(8);
@@ -1815,37 +1851,6 @@ public class YzCardServiceImpl implements IYzCardService {
         insertMap.put("validate_time", "");
         cardFlowMapper.insertFlow(insertMap);
     }
-    public AjaxResult trafficImportText(Map<String, Object> map) {
-        String iccid = map.get("iccid").toString();
-        if (iccid.contains("\n")) {
-            String iccidArr = iccid.replace("\n", ",");
-            String idsArr[] = iccidArr.split(",");
-            if (idsArr.length > 500) {
-                return AjaxResult.error("订购卡总数大于500张,请调整后重试 ！");
-            }
-            for (String s : idsArr) {
-                Map<String, String> stringMap = new HashMap<>();
-                stringMap.put("iccid", s);
-                //判断该卡是否订购过当月套餐
-                int total = cardFlowMapper.selCardFlow(stringMap);
-                if (total == 0) {
-//                    获取卡信息
-                    Map<String, Object> cardInfoMap = yzCardMapper.selOneCardInfo(stringMap);
-                    Map<String, Object> packageInfo = packetMapper.findPackageInfo(map);
-                    //2、根据卡信息生成订单 变更执行类型
-                    this.saveOrderInfo(cardInfoMap, packageInfo);
-                }
-            }
-        } else {
-            Map<String, String> stringMap = new HashMap<>();
-            stringMap.put("iccid", iccid);
-            Map<String, Object> cardInfoMap = yzCardMapper.selOneCardInfo(stringMap);
-            Map<String, Object> packageInfo = packetMapper.findPackageInfo(map);
-            //2、根据卡信息生成订单 变更执行类型
-            this.saveOrderInfo(cardInfoMap, packageInfo);
-        }
-        return AjaxResult.success();
-    }
 }
 
 
diff --git a/yunze-ui/src/views/yunze/flowcard/usageReport/index.vue b/yunze-ui/src/views/yunze/flowcard/usageReport/index.vue
index 05b0e6f..cdd850b 100644
--- a/yunze-ui/src/views/yunze/flowcard/usageReport/index.vue
+++ b/yunze-ui/src/views/yunze/flowcard/usageReport/index.vue
@@ -39,7 +39,7 @@
             clearable>
           </el-input>
         </el-col>
-        <el-button style="width: 7%;margin-left: -228px;" size="medium" v-loading="loading" type="primary" round
+        <el-button style="width: 7%;margin-left: -228px;" size="medium" :loading="loading" type="primary" round
                    @click="selCardUsage">
           统计
         </el-button>
@@ -76,6 +76,7 @@
 </template>
 <script>
 import {cardMonthUsage, listUsage} from "@/api/yunze/flowcard/usage";
+import service from "@/utils/request";
 
 export default {
   name: "index",
@@ -106,23 +107,23 @@ export default {
     selCardUsage() {
       if (this.queryParams.iccid == undefined || this.queryParams.iccid == "") {
         this.$message.error("参数不能为空 ！")
+        return;
       }
       if (this.showIndexOne == true) {
-        this.loading = true;
         let query = {
           dateTime: this.queryParams.valueDay,
           iccid: this.queryParams.iccid
         }
+        this.loading = true;
         listUsage(query).then(res => {
           if (res.code == 200) {
             this.resDay = res.data;
             this.$message.success("操作成功 ！")
             this.showDayChart()
             this.loading = false;
-          } else if (res.code==500){
-            this.loading = false;
-            this.$message.success(res.msg)
           }
+        },error => {
+          this.loading = false;
         })
       }
       if (this.showIndexOne == false) {
@@ -134,13 +135,12 @@ export default {
         cardMonthUsage(query).then(res=>{
           if (res.code == 200) {
             this.resDay = res.data;
+            this.loading = false;
             this.$message.success("操作成功 ！")
             this.showIndexChart();
-            this.loading = false;
-          } else if (res.code==500){
-            this.loading = false;
-            this.$message.success(res.msg)
           }
+        },error => {
+          this.loading = false;
         })
       }
     },
diff --git a/yunze-ui/src/views/yunze/order/orderTariff/index.vue b/yunze-ui/src/views/yunze/order/orderTariff/index.vue
index 511c5a9..8f7c4c3 100644
--- a/yunze-ui/src/views/yunze/order/orderTariff/index.vue
+++ b/yunze-ui/src/views/yunze/order/orderTariff/index.vue
@@ -866,8 +866,8 @@
               </el-row>
             </el-form>
             <br/>
-            <div style="    margin-left: 340px;">
-              <el-button type="primary" @click="submitAddPackageForm">确 定</el-button>
+            <div style="margin-left: 320px;">
+              <el-button type="primary" :loading="loadingOne" @click="submitAddPackageForm">确 定</el-button>
               <el-button @click="addPackageOpen=false">取 消</el-button>
             </div>
           </div>
@@ -926,6 +926,7 @@ import {treeselect} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import tools from "@/utils/yunze/tools";
+import fa from "element-ui/src/locale/lang/fa";
 
 export default {
   name: "OrderTariff",
@@ -942,6 +943,7 @@ export default {
         iccid: null,
         contactPhone: null
       },
+      loadingOne:false,
       activeName: 'second',
       pickerOptions: {
         shortcuts: [{
@@ -1617,15 +1619,32 @@ export default {
     },
     /**手动加包*/
     submitAddPackageForm(){
-      console.log(this.addPackageForm)
+      this.loadingOne=true
       let Pwd_Str = tools.encrypt(JSON.stringify(this.addPackageForm));
+      if (this.addPackageForm.startNo==undefined){
+        this.$message.info("开始号段不能为空 !")
+        this.loadingOne=false
+        return;
+      }
+      if (this.addPackageForm.endNo==undefined){
+        this.$message.info("结束号段不能为空 !")
+        this.loadingOne=false
+        return;
+      }
+      if (this.addPackageForm.validateType==undefined){
+        this.$message.info("类型不能为空 !")
+        this.loadingOne=false
+        return;
+      }
       handAddPackage(Pwd_Str).then(res=>{
         if (res.code==200){
           this.$message.success("加包成功 ！")
           this.addPackageOpen=false
+          this.loadingOne=false
         }else{
           this.$message.error("加包失败 ！")
           this.addPackageOpen=false
+          this.loadingOne=fa
         }
       })
     },