no message

src/components/scenicSpot/reservation/OrderList.vue

@@ -459,7 +459,8 @@
               >
                 <template slot-scope="scope" v-if="scope.$index==0" :row="item.DetailList.length">
                   <template>
-                    <div>{{ item.CouponsName }}<span style="color: gray;">{{item.UseDate}}</span></div>
+                    <div>{{ item.CouponsName }}</div>
+                    <span style="color: #999999;">{{item.UseDate}}</span>
                   </template>
                 </template>
               </el-table-column>
@@ -716,7 +717,7 @@
                 </el-col> -->
                 <el-col :span="20" v-if="typeState==3">
                   <el-form-item label="自提地址" prop="SelffetchAddress">
-                    <el-input class="w200" v-model="msg.SelffetchAddress"></el-input>
+                    <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" v-model="msg.SelffetchAddress"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="20" v-if="typeState==4">
@@ -742,7 +743,7 @@
                     type="button"
                     class="hollowFixedBtn"
                     value="取消"
-                    @click="(outerVisible = false), $refs[msg].resetFields()"
+                    @click="(outerVisible = false), $refs['msg'].resetFields()"
                   />
                 </el-col>
               </el-row>
@@ -1154,13 +1155,19 @@
         clickRightButtom(item, type) {
           // 0取消订单 1确认订单 2已邮寄 3设置自提地址 4收损
           this.msg.OrderId = item.OrderId;
+          this.msg.SelffetchAddress = item.SelffetchAddress
           this.items = item
           this.typeState = type
           if (type == 0) {
             if (!this.loading0) {
               this.cancelOrderId = item.OrderId
               // 销售 OP
-              this.cancelOrderDialog = true;
+              if(this.pagesTitle!='销售'){
+                this.cancelOrderDialog = true;
+              }else{
+                this.cancelOrderHandler()
+              }
+              
             }
           } else if (type == 1) {
             if (!this.loading1) {
@@ -1173,12 +1180,10 @@
           } else if (type == 3) {
             if (!this.loading1) {
               this.outerVisible = true;
-              // this.confirmFun(item, type);
             }
           } else if (type == 4) {
             if (!this.loading2) {
               this.outerVisible = true;
-              // this.msg.OrderId = item.OrderId;
               this.msg.LossMoney = item.LossMoney ? item.LossMoney : 0;
             }
           }
@@ -1229,7 +1234,7 @@
           });
         },
         cancelOrderHandler() {
-          if (this.cancelRemark == "") {
+          if (this.cancelRemark == ""&&this.pagesTitle!='销售') {
             this.Error("请填写取消订单的缘由");
             return;
           }
@@ -1240,7 +1245,7 @@
               {
                 OrderId: this.cancelOrderId,
                 IsOPCancel: this.pagesTitle!='销售'?1:0,
-                Remark: this.cancelRemark
+                Remark: this.pagesTitle!='销售'?this.cancelRemark:''
               },
               res => {
                 if (res.data.resultCode == 1) {