修改订单管理的待处理

src/components/orderMan/orderList.vue

@@ -6,7 +6,7 @@
           class="upload-demo"
           ref="upload"
           :action="importFileUrl"
-          :multiple="true" 
+          :multiple="true"
           :on-success="successUpload"
           :show-file-list="false"
           accept=".csv">
@@ -17,7 +17,7 @@
       </el-button>
       <el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
         清空回收站</el-button>
-      
+
     </div>
     <div class="content">
       <div>
@@ -82,7 +82,7 @@
                   <el-tooltip class="item" effect="dark" :content="item.BuyerMessage" placement="top">
                     <img src="../../assets/img/userman/remark.png" alt="">
                   </el-tooltip>
-                  
+
                 </div>
                 <div flex="dir:left wrap:wrap" class="app-order-offline">
                   <div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">
@@ -133,8 +133,8 @@
                       <div style="margin-bottom: 24px;">
                         <span style="margin-right: 10px;">
                           规格：
-                          <el-tag 
-                            :key="index2" 
+                          <el-tag
+                            :key="index2"
                             v-for="(msg,index2) in list.SpecificationList"
                             style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
                             size="mini">
@@ -196,6 +196,16 @@
                       <img @click="qrEnd(item,6)" v-if="item.OrderStatus==4" class="app-order-icon"
                         src="../../assets/img/userman/sale.png" alt="">
                     </el-tooltip>
+                    <!--待处理-->
+                    <el-tooltip class="item" effect="dark" content="同意" placement="top">
+                      <img @click="pending(item,1)" v-if="item.OrderStatus==6" class="app-order-icon"
+                           src="../../assets/img/userman/pass.png" alt="">
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="拒绝" placement="top">
+                      <img @click="pending(item,2)" v-if="item.OrderStatus==6" class="app-order-icon"
+                           src="../../assets/img/userman/nopass.png" alt="">
+                    </el-tooltip>
+
                   </template>
 
                   <!-- 回收站 -->
@@ -234,7 +244,7 @@
             <div class="card-footer">
               <div>
                 <div flex="dir:left">
-                  <div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}} 
+                  <div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}}
                     地址：{{item.DistrictAddress}}
                     {{item.ShoppingAddress}}</div>
                   <button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
@@ -278,6 +288,14 @@
         <el-button size="small" type="primary" @click="submitForm('exitMsg')">确 定</el-button>
       </span>
     </el-dialog>
+    <!--待处理-->
+    <el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%">
+      <el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="pendD = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="pendingForm()">确 定</el-button>
+      </span>
+    </el-dialog>
     <!-- 发货 -->
     <el-dialog custom-class="app-send" title="发货" :visible.sync="fhDig" width="35%">
       <div class="title-box">
@@ -506,8 +524,15 @@
           Remark: '',
           OrderDetailIdList: [],
         },
+        // 待处理
+        pendMgs:{
+          OrderId:0,
+          Type:1,
+          Remark:0,
+        },
         fahuoList: [],
         fhDig: false,
+        pendD:false,
         exitMsg: {
           OrderId: 0,
           Type: 1,
@@ -767,6 +792,28 @@
           null
         );
       },
+      pending(item,type){
+        this.pendD=true;
+        this.pendMgs.OrderId = item.OrderId;
+        this.pendMgs.Type = type;
+        this.pendMgs.Remark = '';
+      },
+      // 待处理调用接口
+      pendingForm(){
+        this.apipost('/api/order/SetOrderApplyForCancelAudit', this.pendMgs,
+          res => {
+            if (res.data.resultCode === 1) {
+              this.pendD= false
+              this.getList();
+              this.Success(res.data.message)
+
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+
+        );
+      },
       // 确认完成
       qrEnd(item, num) {
         let msg = {

src/components/sallCenter/balanceBudget.vue

@@ -24,7 +24,7 @@
           <div class="searchInput" style="width:250px">
             <el-input style="display:inline-block;width:225px;height:30px"
                       placeholder="请输入昵称搜索"
-                      v-model="msg.Name"
+                      v-model="msg.MemberName"
                       size="small"
                       clearable>
             </el-input>
@@ -116,7 +116,7 @@
             msg:{
               pageIndex:1,
               pageSize:20,
-              Name:'',
+              MemberName:'',
               StartDate:'',
               EndDate:'',
             },
@@ -169,7 +169,7 @@
         },
         Export(){
           let msg = {
-            Name:this.msg.Name,
+            MemberName:this.msg.MemberName,
             StartDate :this.msg.StartDate ,
             EndDate :this.msg.EndDate,
             ExcelEnumIds:this.checkedCities

src/components/sallCenter/couponManage.vue

@@ -50,7 +50,12 @@
           label="优惠方式"
           width="150">
           <template slot-scope="scope">
-            <div >优惠:{{scope.row.DiscountsPrice}}元</div>
+            <div v-if="scope.row.CouponType==1">优惠:{{scope.row.DiscountsPrice}}元</div>
+            <div v-if="scope.row.CouponType==2">
+              <div>{{scope.row.DiscountsPrice}}折</div>
+              <div v-if="scope.row.MaxDiscountsPrice!=0">优惠上限:{{scope.row.MaxDiscountsPrice}}元</div>
+              <div v-if="scope.row.MaxDiscountsPrice==0">优惠上限:无上限</div>
+            </div>
           </template>
         </el-table-column>
         <el-table-column