1

src/components/orderMan/orderList.vue

@@ -104,7 +104,7 @@
                   <el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
                 </div>
                 <el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
-                  <img v-if="item.OrderStatus!=7 && msg.Recycled!=1" @click="OrderExit(item,3)" style="right:60px"
+                  <img v-if="item.OrderStatus==1 || item.OrderStatus==2" @click="OrderExit2(item)" style="right:60px"
                     class="app-order-btnimg" src="../../assets/img/userman/force.png" alt="">
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
@@ -1123,7 +1123,6 @@
           }
         });
       },
-      // 强制取消
       OrderExit(item, type) {
         this.exitMsg.OrderId = item.OrderId;
         this.exitMsg.Type = type;
@@ -1133,6 +1132,30 @@
         }
         this.exitDig = true;
       },
+      // 强制取消
+      OrderExit2(item){
+        let that=this;
+        let text='';
+        if(item.OrderStatus==1){
+          text='确认取消?'
+        }else if(item.OrderStatus==2){
+          text='确认取消?客人付款金额将原路退回。'
+        }
+        that.Confirm(text, function () {
+          that.apipost(
+            "/api/order/SetOrderForcedToCancel",
+            {OrderId:item.OrderId},
+            res => {
+              if (res.data.resultCode == 1) {
+                that.Success(res.data.message);
+                that.getList();
+              } else {
+                that.Error(res.data.message);
+              }
+            },
+          );
+        });
+      },
       handleClick(val) {
         let dataId = val.$attrs.dataId;
         this.msg.OrderStatus = dataId;

src/components/sallCenter/addCoupon.vue

@@ -65,7 +65,7 @@
               </el-form-item>
 
               <el-form-item label="优惠折扣 " prop="DiscountsPrice" class="is-required" v-if="msg.CouponType==2">
-                <el-input v-model="msg.DiscountsPrice" step="1"  min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''">
+                <el-input v-model="msg.DiscountsPrice" step="1"  min="0"  onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''">
                   <template slot="append">折</template>
                 </el-input>
               </el-form-item>
@@ -500,10 +500,11 @@
               return callback(new Error('优惠金额需大于零'));
             }
           }else {
-            if(value>=0){
+            if(value>=0.1 && value<=10){
               return callback();
-            }else {
-              return callback(new Error('优惠折扣不能为空'));
+            }else  {
+              return callback(new Error('优惠折扣范围为0.1~10'));
+
             }
           }
         },

src/components/sallCenter/grantCouPon.vue

@@ -39,7 +39,7 @@
           </el-tooltip>
           <el-input v-model="AliasName" style="width: 20%;margin-left: 5px"  placeholder="昵称/ID/手机号" size="small"/>
           <el-button :loading="loading" @click="lookup" size="small">查找用户</el-button>
-          <div style="width: 80%;display: flex;flex-direction: row;flex-wrap: wrap" v-if="ByPhone.length>0">
+          <div style="width: 80%;display: flex;flex-direction: row;flex-wrap: wrap;margin-top: 5px" v-if="ByPhone.length>0">
             <el-checkbox-group v-model="msg.UserIds" @change = 'SelectBy'>
               <el-checkbox-button v-for="(item,index) in ByPhone" :label="item.Id" :key="index" >
                 <img :src="item.Photo" alt="" class="avatar">
@@ -53,7 +53,6 @@
     </div>
     <el-button type="primary" style="margin: 12px 0 " @click="preserve('msg')" :loading="loading2">保存</el-button>
     <el-button @click="cancel">取消</el-button>
-
   </div>
 </template>
 
@@ -176,7 +175,7 @@
     display: inline-block;
     position: relative;
   }
-  .grantCouPon .user-list .avatar {
+  .grantCouPon  .avatar {
     height: 60px;
     width: 60px;
     border-radius: 30px;

src/components/setup/view/freight.vue

@@ -48,7 +48,7 @@
               label="是否默认"
               width="180">
               <template slot-scope="scope">
-                <el-radio v-model="radio" :label="scope.row.ID" @change="radio=scope.row.ID">
+                <el-radio v-model="radio" :label="scope.row.ID" @change="radioChange(scope.row.ID)">
                   <span class="el-radio__label">默认</span>
                 </el-radio>
               </template>
@@ -120,7 +120,19 @@
           this.GetLogisticsRulesPage()
         },
         radioChange(item){
-
+          this.radio = item;
+          this.apipost(
+            "/api/MallBase/SetLogisticsRulesDefault",
+            {ID:item},
+            res => {
+              if (res.data.resultCode == 1) {
+                this.Success(res.data.message);
+                this.GetLogisticsRulesPage();
+              } else {
+                this.Error(res.data.message);
+              }
+            },
+          );
         },
         handleCurrentChange(val){
           this.msg.pageIndex = val;