云仓2.2-品牌授权下载地址

src/api/module/bankcard.js

@@ -9,15 +9,6 @@ export function getMyAssetListData(data) {
   })
 }
 
-// 获取 提现等权限 getPurviewData
-export function getPurviewData(query) {
-  return request({
-    url: '/local/getOrganization',
-    method: 'get',
-    params: query
-  })
-}
-
 // 获取 主体信息
 export function getOrganizationData(query) {
     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/views/system/asset/myAsset/index.vue

@@ -126,7 +126,7 @@
 </template>
 
 <script>
-  import { getPurviewData,getMyAssetListData,getOrganizationData, getBankDetailsData,getBankcardListData, addBankcardData,editBankcardData ,delBankcardData } from '@/api/module/bankcard'
+  import { getMyAssetListData,getOrganizationData, getBankDetailsData,getBankcardListData, addBankcardData,editBankcardData ,delBankcardData } from '@/api/module/bankcard'
   export default {
     name: "Index",
     data() {
@@ -163,18 +163,8 @@
       this.getBankcardList()
       /** 获取主体信息 */
       this.getOrganization();
-      /** 获取 提现等操作权限 */
-      this.getPurview();
     },
     methods: {
-      /** 获取 提现等操作权限 */
-      getPurview() {
-        getPurviewData().then(res=> {
-          if (res.code == 1) {
-            //this.isAllowWithdraw = res.data.is_allow_withdraw;
-          }
-        });
-      },
       /** 我的资产 所有数据 */
       getMyAssetList() {
         getMyAssetListData( {seller_id:this.seller_id} ).then(res=> {
@@ -184,14 +174,14 @@
               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);
+              this.isAllowWithdraw = res.data.account_info.is_allow_withdraw ? true : 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 : '获取用户列表失败'});
           }
         });
       },

src/views/system/goodsimport/goodsgement.vue

@@ -143,7 +143,7 @@
           </template>
         </el-table-column>
         <el-table-column label="发布时间" align="center" :formatter="formatTime" prop="add_time"/>
-        <el-table-column label="审核说明" align="center" prop="shsm" width="240px"/>
+        <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'>
@@ -232,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 {
@@ -506,18 +506,37 @@
       /** 批量取消申请上架 */
       handleCancelUpale() {
         // id组成的数组 this.ids
+        if( this.ids.length <= 0 ) {
+          this.$message({type:'warning',message:'请先选择需要操作的数据'});
+          return
+        }
+
+        // let isContinue = true;
+        // for (let i = 0; i < this.ids.length; i++) {
+        //
+        // }
+        //
+        // if (!isContinue) {
+        //   this.$message({type:'warning',message:'请先选择需要操作的数据'});
+        //   return
+        // }
+        //return;
+
+        let ids = {goods_id:this.ids.join(',')};
+
         this.$confirm('是否批量取消所选中的商品的上架申请', '批量取消申请上架', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
           center: true
         }).then(async() => {
-          let res = ''//await fn(re)
+          let res = await cancelOnsaleAllData(ids)
           if (res.code == 1) {
             this.$message({type:'success',message:'批量取消成功'});
           } else {
-            this.$message({type:'success',message: res.message ? res.message : 0});
+            this.$message({type:'success',message: res.message ? res.message : '批量取消失败'});
           }
+          this.getList()
         }).catch(() => {});
       },
       // 取消上架申请

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 / 100 }}</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,27 @@
 
     },
     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 == 2) {
+            this.isShowRefundStatusText = true;
+            this.refundStatusText = '已完成退货退款成功'
+          }
+        }
+      },
+
+
       returnInofImgList(imgsStr) {
         let imgList = [];
         if(imgsStr) {
@@ -547,6 +591,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)
           }
         });
       },
@@ -807,7 +853,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() {