Kaynağa Gözat

feat: 修改

linwenxin 1 yıl önce
ebeveyn
işleme
976fdc0cf7

+ 1 - 1
src/api/common.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 export function getSystemList(params) {
   return request({

+ 1 - 1
src/api/coupon.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 export function couponListPageV2(data) {
   return request({

+ 1 - 1
src/api/dashboard.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取概况
 export function getInfo(params) {

+ 1 - 1
src/api/discode.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取优惠码列表
 export function getList(params) {

+ 1 - 2
src/api/discount.js

@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request, { postBlob } from '@/utils/request'
 // 获取列表
 export function getList(params) {
   return request({

+ 1 - 1
src/api/draw.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取列表
 export function getList(params) {

+ 1 - 1
src/api/freight.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 
 export function freightListPageV2(data) {

+ 1 - 1
src/api/invoice.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取发票列表
 export function getInvoiceList(params) {

+ 1 - 1
src/api/marketing.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取分组列表
 export function getGroupList(params) {

+ 1 - 1
src/api/member.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取会员列表
 export function getMemberList(params) {

+ 1 - 2
src/api/merchant.js

@@ -1,5 +1,4 @@
-
-import request from "@/utils/request";
+import request, { postBlob } from '@/utils/request'
 
 export function getList(params) {
   return request({

+ 8 - 0
src/api/miniapp.js

@@ -16,6 +16,14 @@ export function chargingStandardTypeList2(data) {
   })
 }
 
+export function chargingStandardList3(data) {
+  return request({
+    url: `/charging/standard/list3?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
 
 
 // 获取列表

+ 1 - 1
src/api/notice.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取消息列表
 export function getNoticeList(params) {

+ 1 - 1
src/api/offline.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取列表
 export function getList(params) {

+ 1 - 1
src/api/order.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取订单列表
 export function getList(params) {

+ 1 - 1
src/api/package.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取列表
 export function getGoodsList(params) {

+ 1 - 1
src/api/seckill.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 export function secKillGoodsActivityListPageV2(data) {
   return request({

+ 1 - 1
src/api/setting.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 
 export function carouselMapListPageV2(data) {

+ 1 - 2
src/api/settlement.js

@@ -1,5 +1,4 @@
-
-import request from "@/utils/request";
+import request, { postBlob } from '@/utils/request'
 
 
 export function orderShareListPageV2(data) {

+ 1 - 2
src/api/special.js

@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request, { postBlob } from '@/utils/request'
 
 // 获取企业下模板
 export function getEnterpriseTemplate(params) {

+ 1 - 1
src/api/user.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 登录
 export function login(params) {

+ 1 - 1
src/api/wxcustomer.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { postBlob } from '@/utils/request'
 
 // 获取部门列表
 export function getDepartmentList(params) {

+ 9 - 10
src/views/mallManagement/activity/seckill_index/index_1.vue

@@ -5,9 +5,8 @@
     <div slot="moreSearch">
       <el-radio-group v-model="type" size="mini" @change="changeType">
         <el-radio-button label="">全部</el-radio-button>
-        <el-radio-button :label="1">未开始</el-radio-button>
-        <el-radio-button :label="2">进行中</el-radio-button>
-        <el-radio-button :label="3">已结束</el-radio-button>
+        <el-radio-button :label="true">启用</el-radio-button>
+        <el-radio-button :label="false">禁用</el-radio-button>
       </el-radio-group>
       <br><br>
     </div>
@@ -17,7 +16,7 @@
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
-import { closeActivityStatus, openActivityStatus,secKillGoodsActivityListPageV2,secKillGoodsActivityListPageV2Export } from '@/api/seckill'
+import { closeActivityStatus, openActivityStatus, secKillGoodsActivityListPageV2, secKillGoodsActivityListPageV2Export } from '@/api/seckill'
 
 export default {
   components: { TemplatePage },
@@ -71,7 +70,7 @@ export default {
     getList(p) {
       try {
         var pam = JSON.parse(JSON.stringify(p))
-        if (this.type) {
+        if (this.type !== '') {
           pam.status = this.type
           pam.params.push({ "param": "a.status", "compare": "=", "value": this.type })
         }
@@ -79,7 +78,7 @@ export default {
       } catch (error) {
         console.log(error)
       } finally {
-        
+
       }
     },
     // 列表导出函数
@@ -97,15 +96,15 @@ export default {
       return (
         <div class='operation-btns'>
           <el-popconfirm
-            title={`是否确定${Number(row.status) ? "关闭" : "开启"}?`}
+            title={`是否确定${row.status ? "关闭" : "开启"}?`}
             onConfirm={() => {
-              [openActivityStatus, closeActivityStatus][Number(row.status)]({ secKillId: row.secKillId }).then(res => {
-                this.$message({ type: 'success', message: `${Number(row.status) ? "关闭" : "开启"}成功!` })
+              (row.status ? closeActivityStatus : openActivityStatus)({ secKillId: row.secKillId }).then(res => {
+                this.$message({ type: 'success', message: `${row.status ? "关闭" : "开启"}成功!` })
                 this.$refs.pageRef.refreshList()
               })
             }}
           >
-            <el-button type="text" slot="reference">{Number(row.status) ? "关闭" : "开启"}</el-button>
+            <el-button type="text" slot="reference">{row.status ? "关闭" : "开启"}</el-button>
           </el-popconfirm>
           <el-button type="text" onClick={() => {
             this.$router.push({

+ 9 - 15
src/views/mallManagement/activity/seckill_index/index_2.vue

@@ -5,10 +5,8 @@
     <div slot="moreSearch">
       <el-radio-group v-model="type" size="mini" @change="changeType">
         <el-radio-button label="">全部</el-radio-button>
-        <el-radio-button :label="1">未开始</el-radio-button>
-        <el-radio-button :label="2">进行中</el-radio-button>
-        <el-radio-button :label="3">已结束</el-radio-button>
-        <el-radio-button :label="4">已关闭</el-radio-button>
+        <el-radio-button :label="true">启用</el-radio-button>
+        <el-radio-button :label="false">禁用</el-radio-button>
       </el-radio-group>
       <br><br>
     </div>
@@ -57,7 +55,7 @@ export default {
     getList(p) {
       try {
         var pam = JSON.parse(JSON.stringify(p))
-        if (this.type) {
+        if (this.type !== '') {
           pam.status = this.type
           pam.params.push({ "param": "a.status", "compare": "=", "value": this.type })
         }
@@ -89,21 +87,17 @@ export default {
     operation(h, { row, index, column }) {
       return (
         <div class='operation-btns'>
-          {~[1, 2, 4].indexOf(row.status) ? <el-popconfirm
-            title={`是否确定${Number(row.status) ? "关闭" : "开启"}?`}
+          <el-popconfirm
+            title={`是否确定${row.status ? "关闭" : "开启"}?`}
             onConfirm={() => {
-              ({
-                1: closeGoodsStatus,
-                2: closeGoodsStatus,
-                4: openGoodsStatus,
-              })[row.status]({ secKillSpecId: row.secKillSpecId }).then(res => {
-                this.$message({ type: 'success', message: `${Number(row.status) ? "关闭" : "开启"}成功!` })
+              (row.status ? closeGoodsStatus : openGoodsStatus)({ secKillSpecId: row.secKillSpecId }).then(res => {
+                this.$message({ type: 'success', message: `${row.status ? "关闭" : "开启"}成功!` })
                 this.$refs.pageRef.refreshList()
               })
             }}
           >
-            <el-button type="text" slot="reference">{Number(row.status) ? "关闭" : "开启"}</el-button>
-          </el-popconfirm> : null}
+            <el-button type="text" slot="reference">{row.status ? "关闭" : "开启"}</el-button>
+          </el-popconfirm>
           <el-popconfirm
             title={`是否确定删除?`}
             onConfirm={() => {