Merge branch '1.1.18' into test

src/views/system/order/index.vue

@@ -315,20 +315,20 @@
       <div style="margin: 0 10%">
         <el-form ref="form" label-width="100px">
           <el-form-item label="发货类型：">
-            <el-radio-group v-model="radioshop">
+            <el-radio-group v-model="radioshop" @change="radioshopclick()">
               <el-radio :label="1">快递发货</el-radio>
               <el-radio :label="2">自行配送</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="快递公司：" v-if="radioshop == 1">
+          <el-form-item label="快递公司：">
             <el-select size="mini" v-model="expressNum" filterable placeholder="请选择快递公司" style="width: 100%;">
               <el-option v-for="item in expressLists" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-           <el-form-item label="快递公司：" v-if="radioshop == 2">
+           <!-- <el-form-item label="快递公司：" v-if="radioshop == 2">
             <el-input size="mini" v-model="expressNum1" placeholder="请输入快递公司"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="快递单号：">
             <el-input size="mini" v-model="express_sn" placeholder="请输入快递单号"></el-input>
           </el-form-item>
@@ -447,6 +447,7 @@
       // })
     },
     mounted() {
+      
       /** 获取 seller_id*/
       this.sellerId = this.$store.state.user.sellerid;
       /** 获取渠道id */
@@ -457,6 +458,16 @@
       this.getExpressList()
     },
     methods: {
+      radioshopclick(){
+        let data={
+          type:this.radioshop
+        }
+        expressList(data).then(res => {
+          if (res.code == 1) {
+            this.expressLists = res.data.expressLists
+          }
+        })
+      },
       goShipping(id, goods_order_sn) {
         this.goods_ids = goods_order_sn;
         this.titleInfo = '去发货'
@@ -477,7 +488,6 @@
 
         // 物流公司，名称
         let expressName = ''
-        if(this.radioshop == 1){
           if (!this.expressNum) {
           this.$message({
             type: 'warning',
@@ -490,16 +500,7 @@
             expressName = item.label
           }
         })
-        }else{
-          if (!this.expressNum1) {
-          this.$message({
-            type: 'warning',
-            message: '请输入快递公司'
-          })
-          return
-        }
-          expressName = this.expressNum1
-        }
+     
         
 
 
@@ -1114,7 +1115,10 @@
       },
       // 获取物流信息
       getExpressList() {
-        expressList().then(res => {
+        let data={
+          type:this.radioshop
+        }
+        expressList(data).then(res => {
           if (res.code == 1) {
             this.expressLists = res.data.expressLists
           }