Merge branch '01/21VipReset' into online

src/utils/request-loading.js

@@ -0,0 +1,19 @@
+import load from '@/utils/loading'
+let times = 0
+
+export function showFullScreenLoading () {
+  if (times === 0) {
+    load.startLoading()
+  }
+  times++
+
+}
+
+export function tryHideFullScreenLoading () {
+  times--
+  if (times <= 0) {
+    load.endLoading();
+    times = 0
+  }
+
+}

src/utils/request.js

@@ -5,7 +5,7 @@ import store from '@/store'
 import { getToken } from '@/utils/auth'
 import cleanDeep from 'clean-deep'
 // import { Loading } from 'element-ui'
-import load from '@/utils/loading'
+import { showFullScreenLoading, tryHideFullScreenLoading } from './request-loading'
 import router from '@/router/index'
 import Vue from 'vue'
 const showMessage = Symbol('showMessage')
@@ -57,25 +57,6 @@ let vue = new Vue()
 //那么 showFullScreenLoading() tryHideFullScreenLoading() 要干的事儿就是将同一时刻的请求合并。
 //声明一个变量 needLoadingRequestCount，每次调用showFullScreenLoading方法 needLoadingRequestCount + 1。
 //调用tryHideFullScreenLoading()方法，needLoadingRequestCount - 1。needLoadingRequestCount为 0 时，结束 loading。
-let needLoadingRequestCount = 0
-function showFullScreenLoading () {
-  if (needLoadingRequestCount === 0) {
-    load.startLoading()
-  }
-  needLoadingRequestCount++
-
-}
-
-function tryHideFullScreenLoading () {
-  if (needLoadingRequestCount <= 0) return
-  needLoadingRequestCount--
-  if (needLoadingRequestCount === 0) {
-    load.endLoading();
-
-  }
-
-}
-
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
 
 

src/utils/request2.js

@@ -6,7 +6,7 @@ import qs from 'querystring'
 import { getToken } from '@/utils/auth'
 import cleanDeep from 'clean-deep'
 // import { Loading } from 'element-ui'
-import load from '@/utils/loading'
+import { showFullScreenLoading, tryHideFullScreenLoading } from './request-loading'
 import router from '@/router/index'
 import Vue from 'vue'
 const showMessage = Symbol('showMessage')
@@ -58,24 +58,7 @@ let vue = new Vue()
 //那么 showFullScreenLoading() tryHideFullScreenLoading() 要干的事儿就是将同一时刻的请求合并。
 //声明一个变量 needLoadingRequestCount，每次调用showFullScreenLoading方法 needLoadingRequestCount + 1。
 //调用tryHideFullScreenLoading()方法，needLoadingRequestCount - 1。needLoadingRequestCount为 0 时，结束 loading。
-let needLoadingRequestCount = 0
-function showFullScreenLoading () {
-  if (needLoadingRequestCount === 0) {
-    load.startLoading()
-  }
-  needLoadingRequestCount++
-
-}
-
-function tryHideFullScreenLoading () {
-  if (needLoadingRequestCount <= 0) return
-  needLoadingRequestCount--
-  if (needLoadingRequestCount === 0) {
-    load.endLoading();
 
-  }
-
-}
 
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
 

src/views/businessManager/orderManager/financeManager.vue

@@ -404,6 +404,7 @@
             label="缴费单号"
             prop="calenderId"
             :label-width="formLabelWidth"
+             :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
           >
             <el-input
               v-model.trim="form.calenderId"

src/views/businessManager/orderManager/orderAudit-taoqi/orderAuditDetail.vue

@@ -59,6 +59,7 @@
             label="缴费单号"
             prop="calenderId"
             :label-width="formLabelWidth"
+             :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
           >
             <el-input
               v-model.trim="form.calenderId"

src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -59,6 +59,7 @@
         label="缴费单号"
         prop="calenderId"
         :label-width="formLabelWidth"
+         :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
       >
         <el-input
           v-model.trim="form.calenderId"

src/views/businessManager/shopManager/shopList.vue

@@ -18,10 +18,24 @@
                  :on-success="handleSuccess">
         <el-button class="btn-primary">商品导入</el-button>
       </el-upload>
+          <!-- <el-upload v-permission="'export/goods'"
+                 style="display: inline-block; margin: 0 10px;"
+                 action="/api-web/export/goods"
+                 :show-file-list="false"
+                 :before-upload="beforeUpload"
+                 accept=".xlsx,.xls"
+                 :headers="headers"
+                 :on-error="handleError"
+                 :on-success="handleSuccess">
+        <el-button class="btn-primary">商品导出</el-button>
+      </el-upload> -->
+      <el-button v-permission="'export/goods'" class="btn-primary" @click="exportShopList">商品导出</el-button>
       <el-button class="btn-primary"
+
                  @click="onDownload"
                  v-permission="'import/downloadTemplate'">下载模板</el-button>
       <el-button class="btn-primary"
+
                  permission="'goods/update'"
                  @click="onShopComAdd">添加组合商品</el-button>
       <!-- 搜索类型 -->
@@ -515,6 +529,7 @@ import {
   goodsDelete,
   updateGoodsStatus
 } from '@/api/businessManager'
+import qs from 'qs'
 import cleanDeep from 'clean-deep'
 import store from '@/store'
 import Tooltip from '@/components/Tooltip/index'
@@ -978,6 +993,14 @@ export default {
         fileName: '商品导入模板.xlsx'
       })
     },
+    exportShopList(){
+      Export(this, {
+        url: "/api-web/export/goods",
+        params: qs.stringify(cleanDeep(this.searchForm)),
+        fileName: '商品导出.xlsx',
+        method:'post'
+      }, '确定导出商品')
+    },
     onFormClose (formName) {
       // 关闭弹窗重置验证
       this.$refs[formName].resetFields();

src/views/main/api.js

@@ -107,5 +107,6 @@ export const getMusicGroupEduTeacher = data => request2({
 // 获取统计数据
 export const hasIndexErrData = () => request2({
   url: '/api-web/hasIndexErrData',
-  method: 'get'
+  method: 'get',
+  loading: false,
 })

src/views/resetTeaming/modals/pay-items.vue

@@ -9,6 +9,7 @@
         prop="id"
         width="120"
         label="缴费单号"
+         :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
       >
       <template slot-scope="scope">
           <div>