Merge branch 'master_2.2_1026'

public/index.html

@@ -227,9 +227,9 @@
           }
         }
       };
-      xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
+      // xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
       // xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
-      // xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
+      xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
       xhttp.send();
     }
   </script>

src/api/module/bankcard.js

 import request from '@/utils/request'
 
-// 查询bankcard列表
-// export function listBankcard(query) {
-//     return request({
-//         url: '/system/bankcard/list',
-//         method: 'get',
-//         params: query
-//     })
-// }
-// 查询银行名称列表
-// export function listBankname(query) {
-//     return request({
-//         url: '/system/bankcard/getBankList',
-//         method: 'get',
-//         params: query
-//     })
-// }
-
-// 查询bankcard详细
-// export function getBankcard (id) {
-//     return request({
-//         url: '/system/bankcard/edit?id='+id,
-//         method: 'get'
-//     })
-// }
-
-
-// 修改bankcard
-// export function updateBankcard(data) {
-//     return request({
-//         url: '/system/bankcard/edit',
-//         method: 'post',
-//         data: data
-//     })
-// }
-
-// 删除bankcard
-// export function delBankcard(ids) {
-//     return request({
-//         url: '/system/bankcard/delete',
-//         method: 'delete',
-//         data:{id:ids}
-//     })
-// }
-
 // 我的资产 页面 所有数据
 export function getMyAssetListData(data) {
   return request({

src/api/module/goodsgement.js

@@ -62,3 +62,12 @@ export function cancelOnsale(data) {
         data: data
     })
 }
+
+// 批量取消申请上架
+export function cancelOnsaleAllData(data) {
+  return request({
+    url: '/system/goodsNew/cancelOnsaleAll',
+    method: 'post',
+    data: data
+  })
+}

src/api/module/order.js

@@ -143,14 +143,3 @@ export function exportUnSendOrderGoodsData(query) {
     params: query
   })
 }
-
-
-//
-// // 单商品订单 补单发货
-// export function toReissueOrderData(data) {
-//   return request({
-//     url: '/system/order/orderListAgainSend',
-//     method: 'post',
-//     data: data
-//   })
-// }

src/api/module/retreat.js

@@ -73,7 +73,7 @@ export function getSearchParams(query) {
 //     })
 // }
 
-// 列表
+// 售后列表
 export function getRetreatList(query) {
   return request({
     url: '/system/retreat/list',
@@ -117,3 +117,12 @@ export function getASAdressData(query) {
     params: query
   })
 }
+
+// 获取 售后 tab 数量
+export function getTabCountData(data) {
+  return request({
+    url: '/system/retreat/refundListTopNum',
+    method: 'post',
+    data: data
+  })
+}

src/api/webSite.js

@@ -3,9 +3,9 @@ import request from '@/utils/request'
 // 获取渠道id
 export function indexInfo(params) {
   return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
-    // url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
+    // url: '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
+    url: '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
+    // url: '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
     method: 'get',
     params
   })
@@ -13,9 +13,9 @@ export function indexInfo(params) {
 // 获取所有域名
 export function getdomain(params) {
   return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
-    // url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront',
+    // url: '//sysapi.jxhh.com/api/v1/oem/channel/domainFront',
+    url: '//192.168.26.179:6601/api/v1/oem/channel/domainFront',
+    // url: '//newsys.jxhh.com/api/v1/oem/channel/domainFront',
     method: 'get',
     params
   })
@@ -23,9 +23,9 @@ export function getdomain(params) {
 // 获取官网设置接口
 export function webSite(params) {
   return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
-    // url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel',
+    // url: '//sysapi.jxhh.com/api/v1/oem/common/counsel',
+    url: '//192.168.26.179:6601/api/v1/oem/common/counsel',
+    // url: '//newsys.jxhh.com/api/v1/oem/common/counsel',
     method: 'get',
     params
   })
@@ -34,9 +34,9 @@ export function webSite(params) {
 // 云仓所有列表——Banner和域名/产品和服务/供应商入驻
 export function getallCloudList(params) {
   return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
-    // url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList',
+    // url: '//sysapi.jxhh.com/api/v1/oem/front/CloudList',
+    url: '//192.168.26.179:6601/api/v1/oem/front/CloudList',
+    // url: '//newsys.jxhh.com/api/v1/oem/front/CloudList',
     method: 'get',
     params
   })
@@ -44,9 +44,9 @@ export function getallCloudList(params) {
 //获取sso域名
 export function getssoUrl(data) {
   return request({
-    url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
-    // url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
-    // url: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
+    // url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
+    url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
+    // url: '//newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
     method: 'get',
     params: data
   })

src/views/entry/newyuncang.vue

@@ -387,9 +387,9 @@
   import {indexInfo, newsList, companyCounsel, webSite, getdomain, getallCloudList} from '@/api/webSite'
     /** HACK
      * 解决 swiper 轮播图不自动轮播问题
-     * */
+     * 从6.x.x版本降级到5.4.5稳定版本后，没有此问题了
+      */
     // import Swiper2, {Autoplay} from 'swiper';
-    //
     // Swiper2.use([Autoplay]);
 
     /** 仅对官网进行 所有适配
@@ -397,9 +397,7 @@
      * 对 html 根目录 的font-size 进行设置
      * */
     //是否是移动端
-    ;
-
-  (function () {
+    ;(function () {
     // 获取屏幕区域的宽度
     let w = document.documentElement.clientWidth
     if (w < 961) {
@@ -498,21 +496,6 @@
             el: '.swiper-pagination',
             clickable: true,
             type: 'bullets'
-            // type: 'custom',
-            // renderCustom: function(swiper, current,total) {
-            //   let customPaginationHtml = "";
-            //   for (let i = 0; i < total; i++) {
-            //     //判断哪个分页器此刻应该被激活
-            //     if (i == current - 1) {
-            //       customPaginationHtml +=
-            //         '<span class="swiper-pagination-customs swiper-pagination-customs-active"></span>';
-            //     } else {
-            //       customPaginationHtml +=
-            //         '<span class="swiper-pagination-customs"></span>';
-            //     }
-            //   }
-            //   return '<span class="swiperPag">'+customPaginationHtml+'</span>';
-            // }
           },
           autoplay: {
             delay: 4000,
@@ -529,10 +512,6 @@
         },
         swiperBrandOptions: {
           loop: false, // 循环模式选项
-          // autoplay: {
-          //   delay: 4000,
-          //   disableOnInteraction: false
-          // },
           autoplay: false,
           // 设定初始化时slide的索引
           initialSlide: 0,
@@ -542,7 +521,6 @@
           slidesPerView: 1,
           observer: true,
           observeParents: true,
-          //activeLoopIndex: 0,
           on: {
             slideChange: function() {
               _this.isLight = this.activeIndex;
@@ -622,7 +600,7 @@
             id: 5, title: '新闻动态'
           },
           {
-            id: 5, title: '联系我们'
+            id: 6, title: ''
           }
         ],
         brandIndex: 0,
@@ -892,7 +870,6 @@
     }
   }
 
-
   /* 公用 */
   header, section, footer, ul, li, p, dl, dt, dd {
     margin: 0;
@@ -939,10 +916,6 @@
     align-items: center;
   }
 
-  .nav {
-
-  }
-
   .register-login-btn {
     font-size :16px;
   }

src/views/system/asset/myAsset/index.vue

@@ -32,8 +32,9 @@
           </dl>
         </div>
       </div>
-      <div class="row-flex-center">
-        <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 0 40px;" @click="handleWithdraw">提 现</el-button>
+      <div class="row-flex-center" style="margin: 0 0 20px;">
+        <el-button :disabled="isAllowWithdraw" type="primary" size="small" style="padding: 10px 30px; margin: 20px 0;" @click="handleWithdraw">提 现</el-button>
+        <span v-if="isAllowWithdraw" class="spe-tip"><i class="el-icon-warning h-warning"></i>温馨提示：您的账户被禁止提现，请联系工作人员</span>
       </div>
 
       <!-- 账号管理 -->
@@ -67,10 +68,6 @@
         </div>
       </div>
 
-<!--      <div class="row-flex-center">-->
-<!--        <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 40px 40px 0;">编 辑</el-button>-->
-<!--        <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 0 40px;">删 除</el-button>-->
-<!--      </div>-->
     </el-card>
 
     <!-- 添加、编辑 银行卡 信息 -->
@@ -138,6 +135,7 @@
         currentBalance: 0,
         withdrawalBalance: 0,
         withdrawalProgress: 0,
+        isAllowWithdraw: false, // 能否操作提现，sys可设置
         bankcardList: [],
         addBankcardInfoDialog: false,
         bankcardTitle: '',
@@ -176,14 +174,18 @@
               this.withdrawalBalance = Number(res.data.account_info.new_balance) / 100;
               this.withdrawalProgress = Number(res.data.account_info.new_frozen_money) / 100;
               this.currentBalance = this.add(this.withdrawalBalance,this.withdrawalProgress);
+              if ( res.data.account_info.is_allow_withdraw == 0) {
+                this.isAllowWithdraw = true;
+              }else {
+                this.isAllowWithdraw = false;
+              }
             }
             // 账户管理
             if(res.data.bank_list) {
               this.bankcardList = res.data.bank_list;
             }
           }else {
-            let msg = res.message ? res.message : '获取用户列表失败'
-            this.$message({type:'error',message: msg});
+            this.$message({type:'error',message: res.message ? res.message : '获取用户列表失败'});
           }
         });
       },
@@ -446,12 +448,22 @@
     left: calc(50% - 26px);
   }
 
+  .spe-tip {
+    font-size: 12px;
+    color: #909399;
+    padding: 0 0 0 10px;
+  }
+  .h-warning:before {
+    color: #e3c300;
+    padding: 0 3px;
+  }
   /* el-card title hxz 样式统一 end */
   .row-flex-center {
     display: flex;
     flex-direction: row;
     justify-content: center;
     align-items: center;
+    text-align: center;
   }
 
   .row-flex-space-around {
@@ -493,15 +505,6 @@
     box-shadow :0 2px 10px 0 rgba(0,0,0,0.05);
   }
 
-  /*.card-con:hover {*/
-  /*  box-shadow :0 2px 10px 0 rgba(0,0,0,0.1);*/
-  /*}*/
-
-  /* 点击效果 */
-  .checked-bankcard {
-
-  }
-
   .card-name {
     height: 60px;
     line-height: 60px;

src/views/system/asset/withdrawlog/index.vue

@@ -24,8 +24,8 @@
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
-            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
+            <el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -57,15 +57,6 @@
             <el-button type="text" @click="viewDetails(scope.row)">详情</el-button>
           </template>
         </el-table-column>
-<!--        <el-table-column label="提现账号" align="center" prop="BankName">-->
-<!--          <template slot-scope="scope">-->
-<!--            <div>-->
-<!--              {{ scope.row.BankAccountNo }}-->
-<!--            </div>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="提现审核说明" align="center" prop="Des"/>-->
-
       </el-table>
       <!-- 分页 -->
       <div class="footer_pagination">

src/views/system/goodsimport/goodsgement.vue

 <template>
   <div class="app-container">
-    <el-card class="box-card">
+    <el-card class="box-card goods-manage-card">
       <div slot="header" class="clearfix">
         <el-radio-group v-model="radiomodel" class="radiomodels" @change="radiomodelbtn">
           <el-radio-button :label="1">上架销售中（{{onsale_count}}）</el-radio-button>
@@ -23,7 +23,6 @@
                 <el-option label="全部" value="5" v-if='radiomodel==3'></el-option>
                 <el-option label="审核中" value="1" v-if='radiomodel==3'></el-option>
                 <el-option label="审核拒绝" value="2" v-if='radiomodel==3'></el-option>
-
               </el-select>
             </el-form-item>
             <el-form-item label="发布时间">
@@ -101,15 +100,24 @@
                 @click="handledelsale('9','return','all')"
               >批量还原
               </el-button>
+              <el-button
+                v-if='radiomodel==3'
+                :disabled="multiple"
+                style="float:right;margin-left: 20px;align-items:normal"
+                type="primary"
+                size="mini"
+                @click="handleCancelUpale"
+              >批量取消申请上架
+              </el-button>
             </div>
           </el-col>
         </el-row>
       </el-form>
-      <el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="freightList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="商品主图" width="95" align="center">
           <template slot-scope="scope">
-            <img :src="scope.row.default_image" alt="" style="width:80px;height:80px;">
+            <img :src="scope.row.default_image" alt="" style="width:60px;height:60px;">
           </template>
         </el-table-column>
         <el-table-column label="商品编号" align="center" prop="goods_id"/>
@@ -135,6 +143,7 @@
           </template>
         </el-table-column>
         <el-table-column label="发布时间" align="center" :formatter="formatTime" prop="add_time"/>
+        <el-table-column label="审核说明" align="center" prop="last_perate_content" width="240px"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <div v-if='radiomodel==3&&scope.row.up_onsale===1'>
@@ -223,7 +232,7 @@
 <script>
   import goodDetail from './components/goodsdetail'
   import editGood from '@/views/system/goods/add/index'
-  import {getlistGoods, shelvesStatus, delgoodsStatus,cancelOnsale} from '@/api/module/goodsgement'
+  import { getlistGoods, shelvesStatus, delgoodsStatus,cancelOnsale,cancelOnsaleAllData } from '@/api/module/goodsgement'
   import {dateFormat} from '@/utils'
 
   export default {
@@ -248,11 +257,12 @@
           price_min: '',
           price_max: ''
         },
-        fullHeight: 0,
-        tableHeight: 0,
+        // fullHeight: 0,
+        // tableHeight: 0,
         // 遮罩层
         loading: false,
         // 选中数组
+        selectionsList:[],
         ids: [],
         // 非单个禁用
         single: true,
@@ -302,17 +312,17 @@
         this.radiomodel = Number(this.$route.query.goodsStatus);
       }
       this.getList();
-      this.$nextTick(() => {
-        let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
-        this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight - headerHeight
-      })
+      // this.$nextTick(() => {
+      //   let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
+      //   this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight - headerHeight
+      // })
     },
     watch: {
-      fullHeight(val) {
-        let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
-        let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
-        this.tableHeight = val - formHeight - 40 - headerHeight
-      }
+      // fullHeight(val) {
+      //   let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
+      //   let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
+      //   this.tableHeight = val - formHeight - 40 - headerHeight
+      // }
     },
     methods: {
       handledelgrain(row, isall) { //彻底删除
@@ -434,7 +444,6 @@
 
       // 下架/申请上架
       handleUpsale(row, status, isall) { //上下架
-        //debugger
         //console.log(442,row);
         let good_id, is_onsale, title, message
         if (isall == 'one') {
@@ -495,6 +504,44 @@
         });
 
       },
+      /** 批量取消申请上架 */
+      handleCancelUpale() {
+        // id组成的数组 this.ids
+        if( this.ids.length <= 0 ) {
+          this.$message({type:'warning',message:'请先选择需要操作的数据'});
+          return
+        }
+
+        let isContinue = true;
+        for (let i = 0; i < this.selectionsList.length; i++) {
+          if(this.selectionsList[i].up_onsale != 1) {
+            isContinue = false
+            break
+          }
+        }
+        //
+        if (!isContinue) {
+          this.$message({type:'warning',message:'所选商品中有部分未申请上架，请重新勾选'});
+          return
+        }
+
+        let ids = {goods_id:this.ids.join(',')};
+
+        this.$confirm('是否批量取消所选中的商品的上架申请', '批量取消申请上架', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          center: true
+        }).then(async() => {
+          let res = await cancelOnsaleAllData(ids)
+          if (res.code == 1) {
+            this.$message({type:'success',message:'批量取消成功'});
+          } else {
+            this.$message({type:'success',message: res.message ? res.message : '批量取消失败'});
+          }
+          this.getList()
+        }).catch(() => {});
+      },
       // 取消上架申请
       handleCancelUpsale(row) {
         let id = {
@@ -617,7 +664,7 @@
         }
         if (this.formInline.uptime && this.formInline.uptime.length == 2) {
           data['start_time'] = this.formInline.uptime[0] / 1000
-          data['end_time'] = this.formInline.uptime[1] / 1000
+          data['end_time'] = this.formInline.uptime[1] / 1000 + 86399
         }
         if (this.formInline.price_min && this.formInline.price_max) {
           data['price_min'] = this.formInline.price_min
@@ -653,6 +700,7 @@
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
+        this.selectionsList = selection;
         this.ids = selection.map(item => item.goods_id)
         this.single = selection.length !== 1
         this.multiple = !selection.length
@@ -663,6 +711,15 @@
   };
 </script>
 <style scoped lang="scss" type="text/stylus">
+  .app-container {
+    width: 100%;
+    height: 100%;
+  }
+  .goods-manage-card >>> .el-card__body {
+    height: calc(100% - 61px);
+    overflow-y : auto;
+  }
+
   .freightTemplate-add {
     /deep/ .el-dialog {
       height: 80%;

src/views/system/order/components/orderDetail.vue

@@ -7,6 +7,12 @@
         <el-step title="订单完成"></el-step>
       </el-steps>
     </el-card>
+
+    <p class="order-status-con" v-if="isShowOrderStatusInfo(orderDetail.status,orderDetail.settlement_status)">
+      <span>订单状态：</span>
+      <span>已完成，已结算</span>
+    </p>
+
     <el-card style="margin-top: 20px;">
       <div class="orderList">
         <div class="orderItem">
@@ -319,12 +325,21 @@ export default {
       onlyEidtPlaceholder: false,
       goShippingNum: 0, // 发货类型
       goods_ids: null, // 发货的商品订单 id
+      // isShowOrderStatus: false,
+      //orderStatusInfo: ''
     }
   },
   watch: {},
   created() {},
   mounted() {},
   methods: {
+    /** 订单最终状态 */
+    isShowOrderStatusInfo(status,settlementStatus) {
+      let isShow  = (status == 3 && settlementStatus == 1) ? true : false;
+      // console.log("订单最终状态：",status,settlementStatus);
+      // this.orderStatusInfo = ''
+      return isShow;
+    },
     /** 商品 发货状态 */
     goodsStatusFormatter(status) {
       let res = '—';
@@ -853,9 +868,18 @@ export default {
 
   .orderDetail {
     height: 660px;
+    padding: 0 20px;
     overflow-y: auto;
+  }
 
+  .order-status-con {
+    padding: 20px;
+    border: 1px solid #eee;
+    border-radius: 4px;
+    font-size: 16px;
+    box-shadow: 0 2px 10px 0 rgba(0,0,0,0.1);
   }
+
   .text-r {
     justify-content: center;
     background: #F7F8FA;

src/views/system/retreat/edit.vue

 <template>
-  <div class="app-container after-sale-detail">
+  <div class="after-sale-detail">
     <el-card>
       <!-- 仅退款 -->
       <div v-if="asOrderType == 1" class="as-step-info">
@@ -21,6 +21,15 @@
       </div>
     </el-card>
 
+    <el-card style="margin: 10px 0;" v-if="isShowRefundStatusText">
+      <p>
+        <span>售后状态：</span>
+        <span>{{ refundStatusText }}</span>
+        <span>退款金额：</span>
+        <span>{{ asOrderDetail.apply_price }}</span>
+      </p>
+    </el-card>
+
     <el-card class="as-order-details">
       <!-- 倒计时 提示 -->
       <p class="count-down-con" v-if="!(asOrderDetail.status == 5 || asOrderDetail.status == -1)"><i class="spec-icon-w el-icon-warning"></i>剩余处理时间： <span class="cd-time-span">{{ cdHour }} 小时 {{ cdMinute }} 分</span> 请在期限内处理，逾期不处理，系统将自动退款到买家账户</p>
@@ -206,7 +215,11 @@
       :title="dialogASTypeTitle"
       :visible.sync="isASTypeDialog"
       width="50%"
-      center>
+      center
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+    >
       <div v-if="onlyIsAgree == 1" class="only-refund-agree">
         <p>同意退款，该订单将关闭，请您仔细核实商品发货状态以及退款金额，若因此导致的损失将由您自己承担！</p>
         <p>确定同意同款吗？</p>
@@ -261,12 +274,19 @@
   import { dateFormat } from '@/utils'  //getASOrderDetail
   export default {
     name: "Edit",
+    props: {
+      // 当前 售后订单的 id
+      asGoodId: {
+        type: String,
+        required: true
+      }
+    },
     data() {
       return {
         // Refund only   仅退款
         // Return refund 退货退款
         timer: null,
-        asGoodId: 0, // 当前 售后订单的 id
+        //asGoodId: 0, // 当前 售后订单的 id
         asOrderType: 1, // 售后类型 1-仅退款； 2-退货退款
         // 仅退款 流程，每个步骤文字提示
         step: 1, // 激活 当前步骤
@@ -328,20 +348,23 @@
         order_refund_address:'',
         isFinishedButtonDisabled: false,
         returnRefundDisabled: false, // 仅 退货退款 订单，需要此参数，控制，拒收包裹-同意退款按钮是否可以点击
+
+        isShowRefundStatusText: false,
+        refundStatusText: '',
       } // return end
     },
     watch: {
-      $route(to,from) {
-        if(this.$route.query.refund_sn) {
-          this.asGoodId = this.$route.query.refund_sn;
-          this.getDetail();
-        }
-      }
+      // $route(to,from) {
+      //   if(this.$route.query.refund_sn) {
+      //     this.asGoodId = this.$route.query.refund_sn;
+      //     this.getDetail();
+      //   }
+      // }
     },
     created() {
       this.sellerId = this.$store.state.user.sellerid;
       /** 获取 当前售后 订单的id */
-      this.asGoodId = this.$route.query.refund_sn;
+      //this.asGoodId = this.$route.query.refund_sn;
       /** 查询 售后订单详情 */
       this.getDetail();
       /** 获取 退货退款的发送 地址 */
@@ -351,6 +374,31 @@
 
     },
     methods: {
+      /** 售后状态 */
+      refundTypeStatus(refundType,goodsStatus,status ) {
+        this.refundStatusText = '';
+        this.isShowRefundStatusText = false;
+        if (status == 5) {
+          if(refundType == 1 && goodsStatus == 0) {
+            this.isShowRefundStatusText = true;
+            this.refundStatusText = '未发货仅退款成功'
+          }
+          if(refundType == 1 && goodsStatus == 1) {
+            this.isShowRefundStatusText = true;
+            this.refundStatusText = '已发货仅退款成功'
+          }
+          if(refundType == 2 && goodsStatus == 1) {
+            this.isShowRefundStatusText = true;
+            this.refundStatusText = '已发货退货退款成功'
+          }
+          if(refundType == 2 && goodsStatus == 2) {
+            this.isShowRefundStatusText = true;
+            this.refundStatusText = '已完成退货退款成功'
+          }
+        }
+      },
+
+
       returnInofImgList(imgsStr) {
         let imgList = [];
         if(imgsStr) {
@@ -547,6 +595,8 @@
             }else {
               this.asApplyList = [];
             }
+            //console.log(111,this.asOrderType,this.goodsOrderDetail.goods_status,this.asOrderDetail.status)
+            this.refundTypeStatus(this.asOrderType,this.goodsOrderDetail.goods_status,this.asOrderDetail.status)
           }
         });
       },
@@ -700,15 +750,9 @@
             this.getDetail();
           });
         } // type 4 end
-
-        //
-
       },
-      /**  */
-
       /** 取消  售后对话框 */
       cancelAfterSale(type) {
-        //console.log("拒绝类型",type);
         this.isASTypeDialog = false;
       },
       /** 售后 退货退款 地址 */
@@ -807,7 +851,7 @@
 
 <style scoped>
   .after-sale-detail {
-    overflow: auto;
+    /*overflow: auto;*/
   }
   .as-detail-title {
     text-align: center;

src/views/system/shop/brand.vue

@@ -418,8 +418,10 @@
           brand_business_auth: [{ required: true, message: '品牌经营授权至少上传一张图片', validator: authBusValidator }],
         },
         downTemplatehttp: '',
-        shopTemplatehttp : 'http://img3.jxhh.com/shop/brand.doc',
-        factoryTemplatehttp : 'http://img3.jxhh.com/shop/factory.doc',
+        // shopTemplatehttp : 'http://excel.jxhh.com/brand_new.doc',
+        // factoryTemplatehttp : 'http://excel.jxhh.com/brand_new.doc',
+        shopTemplatehttp : 'http://excel.jxhh.com/brand_new.doc',
+        factoryTemplatehttp : 'http://excel.jxhh.com/brand_new.doc',
       }
     },
     created() {