管理端 批量更改发货状态进行二次确认提示

# Conflicts:
#	yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java

@@ -101,10 +101,6 @@ public class ReplenishmentTask {
             rechargeOrderMapper.updateById(orderDO);
             // 写入 充值档位记录表
             storeOrderService.addPhone(orderDO, outTradeNo);
-        } else {
-            orderDO.setIsReplenishment(1);
-            orderDO.setReplenishmentName(map.toString());
-            rechargeOrderMapper.updateById(orderDO);
         }
     }
 

yudao-ui-admin/src/views/shop/rechargeOrder/index.vue

@@ -160,6 +160,7 @@ import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import ElementForm from "@/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue";
 import Treeselect from "@riophae/vue-treeselect";
 import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+import {deletePhoneRecord} from "@/api/shop/phoneRecord";
 export default {
   name: "RechargeOrder",
   computed: {
@@ -283,10 +284,14 @@ export default {
         return false;  //禁用
       }
     },
-    async handleGoods(){
+     handleGoods(){
       if(this.multipleSelection.length){
-        await updateByIds({ids:this.multipleSelection,status:true})
-        this.getList();
+          this.$modal.confirm('是否更改勾选订单发货状态?').then(()=> {
+             return updateByIds({ids:this.multipleSelection,status:true})
+          }).then(() => {
+            this.getList();
+            this.$modal.msgSuccess("修改成功");
+          }).catch(() => {});
       }else {
         this.$modal.msgWarning("请勾选需要更改发货状态的订单")
       }

yudao-ui-admin/src/views/shop/refundOrder/index.vue

@@ -322,7 +322,7 @@ export default {
         });
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("发起退款成功");
+        this.$modal.msgSuccess("操作成功");
       }).catch(() => {});
     },
     /** 提交按钮 */

yudao-ui-app/pages/member_record/index.vue

@@ -198,6 +198,9 @@
 </script>
 
 <style lang="scss" scoped>
+  ::v-deep .u-textarea__count{
+      bottom: -26rpx;
+  }
   .box {
     margin-top: 10%;
     padding: 20% 40rpx;