Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin

.env.development

@@ -7,7 +7,7 @@ VUE_APP_BASE_API = '/dev-api'
 # 开发环境
 # VUE_APP_DOMAIN_PREFIX = 'http://192.168.0.91:9003'
 # 线上
-VUE_APP_DOMAIN_TUAN = 'https://www.tuanfengkeji.cn:9527/dts-app-api'
+VUE_APP_DOMAIN_TUAN = 'https://www.tuanfengkeji.cn/dts-app-api'
 VUE_APP_DOMAIN_PREFIX = 'https://nsadminapi.tuanfengkeji.cn'
 # 演示环境
 # VUE_APP_DOMAIN_PREFIX = 'http://192.168.0.91:9003'

.env.production

@@ -4,5 +4,5 @@ ENV = 'production'
 # base api
 VUE_APP_BASE_API = '/prod-api'
 
-VUE_APP_DOMAIN_TUAN = 'https://www.tuanfengkeji.cn:9527/dts-app-api'
+VUE_APP_DOMAIN_TUAN = 'https://www.tuanfengkeji.cn/dts-app-api'
 VUE_APP_DOMAIN_PREFIX = 'https://nsadminapi.tuanfengkeji.cn'

.env.staging

@@ -9,5 +9,5 @@ VUE_APP_BASE_API = '/stage-api'
 # 线上
 # VUE_APP_DOMAIN_PREFIX = 'https://nsadminapi.tuanfengkeji.cn'
 # 测试
-VUE_APP_DOMAIN_TUAN = 'https://test.tuanfengkeji.cn:9527/dts-app-api'
+VUE_APP_DOMAIN_TUAN = 'https://test.tuanfengkeji.cn/dts-app-api'
 VUE_APP_DOMAIN_PREFIX = 'https://nsadminapitest.tuanfengkeji.cn'

src/api/signInManagement/transactionSignIn.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 分页查询消费金签到配置
+export function getAllBeeSignConfig(data) {
+  return request({
+    url: '/buyerBeeSignConfig/getAll',
+    method: 'post',
+    data
+  })
+}
+
+// 查询消费金签到配置
+export function getByIdBeeSignConfig(params) {
+  return request({
+    url: '/buyerBeeSignConfig/getById',
+    method: 'get',
+    params
+  })
+}
+
+// 新增消费金签到配置
+export function saveBeeSignConfig(data) {
+  return request({
+    url: '/buyerBeeSignConfig/save',
+    method: 'post',
+    data
+  })
+}
+
+// 修改消费金签到配置
+export function updateBeeSignConfig(data) {
+  return request({
+    url: '/buyerBeeSignConfig/update',
+    method: 'post',
+    data
+  })
+}
+
+// 删除消费金签到配置
+export function deleteByIdBeeSignConfig(params) {
+  return request({
+    url: '/buyerBeeSignConfig/deleteById',
+    method: 'get',
+    params
+  })
+}

src/api/signInManagement/voucherSignIn.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 分页查询代金券签到配置
+export function getAllVoucherSignConfig(data) {
+  return request({
+    url: '/buyerVoucherSignConfig/getAll',
+    method: 'post',
+    data
+  })
+}
+
+// 查询代金券签到配置
+export function getByIdVoucherSignConfig(params) {
+  return request({
+    url: '/buyerVoucherSignConfig/getById',
+    method: 'get',
+    params
+  })
+}
+
+// 新增代金券签到配置
+export function saveVoucherSignConfig(data) {
+  return request({
+    url: '/buyerVoucherSignConfig/save',
+    method: 'post',
+    data
+  })
+}
+
+// 修改代金券签到配置
+export function updateVoucherSignConfig(data) {
+  return request({
+    url: '/buyerVoucherSignConfig/update',
+    method: 'post',
+    data
+  })
+}
+
+// 删除代金券签到配置
+export function deleteByIdVoucherSignConfig(params) {
+  return request({
+    url: '/buyerVoucherSignConfig/deleteById',
+    method: 'get',
+    params
+  })
+}

src/api/user.js

@@ -57,3 +57,12 @@ export function changeHeader(data) {
     data
   })
 }
+
+//  获取验证码
+export function getVerificationImageCaptchaApi(params) {
+  return request({
+    url: '/captcha/get/verification/image',
+    method: 'get',
+    params
+  })
+}

src/components/GraphicVerificationCode/SliderCaptcha.vue

@@ -0,0 +1,483 @@
+<template>
+  <div class="slider-captcha-container">
+    <div v-if="dialogVisible" class="lang-dialog">
+      <div class="lang-dialog__header">
+        <div class="lang-dialog__title">
+          <slot name="title">{{ title }}</slot>
+        </div>
+        <div type="button" class="lang-dialog-header-btn" @click="close"> <i class="lang-icon-close"></i> </div>
+      </div>
+      <div class="lang-dialog__body">
+        <div v-show="failed" class="tips">
+          <slot name="errorText">{{ errorText }}</slot>
+        </div>
+        <div v-show="!failed" class="tips">
+          <slot name="tips">{{ tips }}</slot>
+        </div>
+        <div class="slider-body" :class="{ 'slider-shock': shock }">
+          <div v-show="mask" class="loading-transparent-mask"></div>
+          <div v-if="loading" class="loading-body">
+            <div class="loading slider-loading"></div>
+          </div>
+          <div
+            v-show="!loading" class="slider-bg slider-img"
+            :style="{ 'background-image': 'url(data:image/png;base64,' + shadeImage + ')' }"
+          >
+          </div>
+          <div
+            v-show="!loading" class="slider-draw slider-move-draw slider-img"
+            :style="{ 'background-image': 'url(data:image/png;base64,' + cutoutImage + ')', 'top': sliderY + 'px', 'left': sliderMoveDrawLeft }"
+            @touchstart.stop="sliderTouchStart" @touchmove.stop="sliderTouchMove" @touchend.stop="sliderEnd"
+            @mousedown="sliderDown"
+          >
+          </div>
+          <div class="slider-progress"></div>
+          <div v-show="success" class="slider-success">
+            <div class="slider-success-icon">
+              成功
+            </div>
+            <div class="slider-success-text">
+              <slot name="successText">{{ successText }}</slot>
+            </div>
+          </div>
+          <div
+            class="slider-btn slider-move-btn" :style="{ 'left': sliderMoveLeft }"
+            :class="{ 'slider-shock': shock }" @touchstart.stop="sliderTouchStart" @touchmove.stop="sliderTouchMove"
+            @touchend.stop="sliderEnd" @mousedown="sliderDown"
+          >
+            <i>&nbsp;</i>
+            <span style="width: 100%;color: #ffffff;">● ● ●</span>
+          </div>
+        </div>
+        <div style="position:relative;display: flex;align-items: center;width: 280px;margin: 0 auto;">
+          <div class="slider-refresh" @click.stop="questionMessage = !questionMessage">
+            说明
+          </div>
+          <div class="slider-refresh" @click.stop="refresh">
+            刷新
+          </div>
+        </div>
+        <div v-if="questionMessage">
+          <slot name="question">
+            <div v-if="question">{{ question }}</div>
+            <div v-else>无注意事项</div>
+          </slot>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SliderCaptcha',
+  props:
+    {
+      value: {
+        type: Boolean,
+        defalut: false
+      },
+      loading: {
+        type: Boolean,
+        defalut: false
+      },
+      title: {
+        type: String,
+        default: '滑块安全验证'
+      },
+      tips: {
+        type: String,
+        default: '拖动下方滑块完成拼图'
+      },
+      successText: {
+        type: String,
+        default: '验证成功'
+      },
+      errorText: {
+        type: String,
+        default: '是不是太难了，咱换一个'
+      },
+      question: {
+        type: String,
+        default: ''
+      },
+      options: {
+        type: Object,
+        default() {
+          return {
+            cutoutImage: '',
+            shadeImage: '',
+            sliderKey: '',
+            sliderY: ''
+          }
+        }
+      }
+    },
+  data() {
+    return {
+      dialogVisible: false,
+      mask: false,
+      success: false,
+      failed: false,
+      cutoutImage: '',
+      shadeImage: '',
+      sliderKey: '',
+      sliderX: 26,
+      sliderY: '',
+      sliderMoveDrawLeft: '26px',
+      sliderMoveLeft: '20px',
+      shock: false,
+      tipEvents: {},
+      sliderMoveX: 0,
+      questionMessage: false
+    }
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.init(val)
+      },
+      immediate: true
+    },
+    options: {
+      handler(option) {
+        this.clear()
+        this.cutoutImage = option.cutoutImage
+        this.shadeImage = option.shadeImage
+        this.sliderKey = option.sliderKey
+        this.sliderY = option.sliderY
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    init(open) {
+      this.dialogVisible = open
+      if (open) {
+        this.clear()
+      }
+    },
+    clear() {
+      this.mask = false
+      this.success = false
+      this.failed = false
+      this.cutoutImage = ''
+      this.shadeImage = ''
+      this.sliderKey = ''
+      this.sliderX = 26
+      this.sliderMoveDrawLeft = '26px',
+      this.sliderMoveLeft = '20px',
+      this.sliderY = ''
+    },
+    check(sliderKey, sliderX) {
+      this.$emit('check', { sliderKey, sliderX, done: this.done, error: this.error })
+    },
+    done() {
+      this.success = true
+    },
+    error() {
+      this.failed = true
+      this.mask = true
+      this.shock = true
+      setTimeout(() => {
+        this.shock = false
+        this.$emit('error')
+      }, 1000)
+    },
+    close() {
+      this.dialogVisible = false
+      this.$emit('input', this.dialogVisible)
+      this.$emit('close')
+    },
+    refresh() {
+      this.$emit('refresh')
+    },
+    sliderTouchStart(e) {
+      // 移动触摸移动
+      const that = this
+      const slider = e.target
+      that.sliderMoveX = e.touches[0].clientX - slider.offsetLeft
+      console.log(e, e.touches[0].clientX, slider.offsetLeft)
+    },
+    sliderTouchMove(e) {
+      const that = this
+      const left = e.touches[0].clientX - that.sliderMoveX
+      if (left >= 20 && left <= 280) {
+        that.sliderMoveDrawLeft = 5 + left + 'px'
+        that.sliderMoveLeft = left + 'px'
+        that.sliderX = 5 + left
+      }
+    },
+    sliderEnd() {
+      this.check(this.sliderKey, this.sliderX)
+    },
+    sliderDown(e) {
+      console.log(e)
+      const that = this
+      const slider = e.target // 获取目标元素
+      // 算出鼠标相对元素的位置
+      that.sliderMoveX = e.clientX - slider.offsetLeft
+      document.onmousemove = (e) => {
+        const left = e.clientX - that.sliderMoveX
+        if (left >= 20 && left <= 280) {
+          //   slider.style.left = left + 'px'
+          that.sliderMoveDrawLeft = 5 + left + 'px'
+          that.sliderMoveLeft = left + 'px'
+          that.sliderX = 5 + left
+        }
+      }
+      document.onmouseup = () => {
+        document.onmousemove = null
+        document.onmouseup = null
+        this.check(this.sliderKey, this.sliderX)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.slider-captcha-container {
+	box-sizing: border-box;
+
+	.slider-shock {
+		animation-delay: 0s;
+		animation-name: shock;
+		animation-duration: .1s;
+		animation-iteration-count: 5;
+		animation-direction: normal;
+		animation-timing-function: linear;
+	}
+
+	@keyframes shock {
+		0% {
+			transform: translateX(2px);
+		}
+
+		100% {
+			transform: translateX(-2px);
+		}
+	}
+
+	/* 弹窗开始  */
+	.lang-dialog {
+		position: relative;
+		border-radius: 2px;
+		box-shadow: 0 1px 3px rgba(0, 0, 0, 30%);
+		box-sizing: border-box;
+		background: #FFF;
+	}
+
+	.lang-dialog__header {
+		padding: 20px 20px 10px;
+	}
+
+	.lang-dialog__title {
+		line-height: 20px;
+		font-size: 18px;
+		color: #525252;
+	}
+
+	.lang-dialog-header-btn {
+		position: absolute;
+		top: 20px;
+		right: 20px;
+		padding: 0;
+		background: 0 0;
+		border: none;
+		outline: 0;
+		cursor: pointer;
+		font-size: 16px
+	}
+
+	.lang-icon-close {
+		color: rgba(0, 0, 0, 0.68);
+		font-size: 20px;
+	}
+
+	.lang-icon-close:before {
+		content: '×';
+	}
+
+	.lang-icon-close:hover {
+		color: rgba(0, 0, 0, 0.88);
+	}
+
+	.lang-dialog__body {
+		padding: 0 0 6px;
+		color: #828282;
+		font-size: 14px;
+		text-align: center;
+		word-break: break-all;
+	}
+
+	.loading-transparent-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: transparent;
+		z-index: 999;
+	}
+
+	/* 弹窗结束  */
+	/* loading start */
+	.loading-body {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(255, 255, 255, 0.6);
+		z-index: 999;
+	}
+
+	.loading {
+		position: relative;
+		display: inline-block;
+		width: 30px;
+		height: 30px;
+		border-radius: 50%;
+		border-top: 2px solid transparent;
+		border-bottom: 2px solid transparent;
+		border-left: 2px solid #409eff;
+		border-right: 2px solid #409eff;
+		animation: loading 1s infinite linear;
+	}
+
+	@keyframes loading {
+		to {
+			transform: rotate(360deg);
+		}
+	}
+
+	.slider-loading {
+		position: absolute;
+		top: calc(50% - 15px);
+		left: calc(50% - 15px);
+		z-index: 999;
+	}
+
+	/* loading end */
+	.lang-dialog__header {
+		padding: 20px 10px 10px;
+	}
+
+	.tips {
+		color: #525252;
+		line-height: 36px;
+		font-size: 18px;
+	}
+
+	.slider-body {
+		position: relative;
+		width: 280px;
+		height: 230px;
+		margin: 0 auto;
+	}
+
+	.slider-bg {
+		position: relative;
+		width: 280px;
+		height: 171px;
+		overflow: hidden;
+		background-position: top left;
+		// background-size: cover;
+		background-size: auto auto;
+		background-repeat: no-repeat;
+	}
+
+	.slider-draw {
+		position: absolute;
+		z-index: 1;
+		left: 26px;
+		width: 50px;
+		height: 50px;
+		background-position: top left;
+		background-size: cover;
+		background-repeat: no-repeat;
+		cursor: pointer;
+		opacity: 1;
+		box-shadow: 0px 0px 10px 2px #000000;
+	}
+
+	.slider-progress {
+		position: relative;
+		z-index: 1;
+		width: 280px;
+		height: 16px;
+		margin-top: 22px;
+		background-color: #c8c8c8;
+		border-radius: 8px;
+		opacity: 1;
+	}
+
+	.slider-btn {
+		position: absolute;
+		top: 184px;
+		z-index: 1;
+		width: 65px;
+		height: 35px;
+		line-height: 35px;
+		background-color: rgb(0, 87, 212);
+		box-shadow: rgba(0, 87, 212, 50%) 0px 0px 5.05952px 0.505952px;
+		text-align: center;
+		border-radius: 999px;
+		cursor: pointer;
+		opacity: 1;
+		-moz-user-select: none;
+		/* 禁止双击节点被选中 */
+		-o-user-select: none;
+		-khtml-user-select: none;
+		-webkit-user-select: none;
+		-ms-user-select: none;
+		user-select: none;
+		-moz-user-drag: none;
+		/* 禁止被拖动 */
+		-webkit-user-drag: none;
+		/* 禁止被拖动 */
+		// pointer-events: none;
+		// display: inline-block;
+		// vertical-align: middle;
+	}
+
+	.slider-btn i {
+		display: inline-block;
+		width: 0;
+		vertical-align: middle;
+	}
+
+	.slider-success {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 4;
+		background: hsla(0, 0%, 100%, .8);
+	}
+
+	.slider-success .slider-success-icon {
+		width: 64px;
+		height: 64px;
+		margin: 15px auto 0;
+	}
+
+	.slider-success .slider-success-text {
+		color: #1bc300;
+		text-align: center;
+		margin-top: 16px;
+		font-size: 18px;
+	}
+
+	.slider-refresh {
+		margin: 0 16px 0 0;
+		cursor: pointer;
+		font-size: 18px;
+		height: 30px;
+		line-height: 30px;
+	}
+}
+</style>

src/components/GraphicVerificationCode/index.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="graphic-verification-code-container">
+    <div style="display: flex;align-items: center;">
+      <el-input
+        :value="inputCode" maxlength="6" type="text" auto-complete="off"
+        style="width: 63%;max-width: 200px;"
+        placeholder="请输入验证码" @input="handleCodeInput" @keyup.enter.native="$emit('enter-down')"
+      >
+        <template #prefix>
+          <svg-icon icon-class="password" class="el-input__icon input-icon" />
+        </template>
+      </el-input>
+      <div style="margin-left: 8px;">
+        <el-button type="primary" :loading="codeLoading" @click="handleGainVerify">
+          <span v-if="!codeLoading">获取验证码</span>
+          <span v-else>{{ codeCount }} s</span>
+        </el-button>
+      </div>
+    </div>
+    <el-dialog
+      :visible.sync="isShowGraphicVerificationDialog" v-bind="{ closeOnClickModal: false, width: '600px', title: '滑动码验证' }"
+      append-to-body
+    >
+      <div>
+        <div style="margin: 28rpx 0 0;">
+          <SliderCaptcha
+            v-model="slideVisible" :options="slideOptions" :loading="slideLoading"
+            @check="handleConfirmSlide" @close="isShowGraphicVerificationDialog = false" @refresh="getSliderOptions"
+            @error="getSliderOptions"
+          >
+            <template #title>安全验证</template>
+            <template #successText>验证通过</template>
+            <template #errorText>
+              <text style="color: #dc362e;">是不是太难了，换一个</text>
+            </template>
+            <template #tips>拖动下方滑块完成拼图</template>
+            <template #question>请尽快完成滑动自定义提示</template>
+          </SliderCaptcha>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import SliderCaptcha from './SliderCaptcha'
+import { getCode, getVerificationImageCaptchaApi } from '@/api/user'
+import { getUpdatePhoneCode, getPrivacyCode } from '@/api/privacy'
+
+export default {
+  name: 'GraphicVerificationCode',
+  components: {
+    SliderCaptcha
+  },
+  props: {
+    phone: {
+      type: [String, Number],
+      default: ''
+    },
+    apiType: {
+      type: [String, Number],
+      default: 'default' // default, update, privacy
+    }
+  },
+  data() {
+    return {
+      inputCode: '',
+      codeTimer: '',
+      codeLoading: false,
+      codeCount: '',
+
+      isShowGraphicVerificationDialog: false,
+      slideVisible: false,
+      slideLoading: false,
+      slideOptions: {
+        cutoutImage: '',
+        shadeImage: '',
+        sliderKey: '',
+        sliderY: ''
+      }
+    }
+  },
+  mounted() { },
+  methods: {
+    handleCodeInput(e) {
+      console.log(e)
+      this.inputCode = e
+      this.$emit('input', this.inputCode)
+    },
+    // 获取验证码
+    async getVerificationCode() {
+      if (!this.phone) {
+        this.$message.error('请填写电话号码')
+        return
+      }
+      try {
+        let _api
+        if (this.apiType === 'update') {
+          _api = getUpdatePhoneCode
+        } else if (this.apiType === 'privacy') {
+          _api = getPrivacyCode
+        } else {
+          _api = getCode
+        }
+        const res = await _api({ phone: this.phone, x: '0', y: '0' })
+        this.$message({
+          message: '发送成功，请注意查看手机短信',
+          type: 'success'
+        })
+        if (!this.codeTimer) {
+          this.codeLoading = true
+          this.codeTimer = setInterval(() => {
+            if (this.codeCount > 1 && this.codeCount <= 60) {
+              this.codeCount--
+            } else {
+              clearInterval(this.codeTimer) // 清除定时器
+              this.codeTimer = null
+              this.codeLoading = false
+            }
+          }, 1000)
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+
+    async handleGainVerify() {
+      if (!this.phone) {
+        this.$message.error('请填写电话号码')
+        return
+      } else if (!/^1[3-9]\d{9}$/.test(this.phone)) {
+        this.$message({
+          message: '请输入正确手机号',
+          type: 'warning'
+        })
+        return
+      }
+      this.isShowGraphicVerificationDialog = true
+      this.slideVisible = true
+      this.getSliderOptions()
+    },
+    getSliderOptions() {
+      this.slideLoading = true
+      getVerificationImageCaptchaApi({ type: 'slide' })
+        .then((res) => {
+          this.slideOptions = {
+            cutoutImage: res.data.cutoutImage,
+            shadeImage: res.data.shadeImage,
+            sliderKey: 'key',
+            sliderY: res.data.y
+          }
+          this.slideLoading = false
+        })
+    },
+    handleConfirmSlide({ sliderKey, sliderX, done, error }) {
+      this.slideLoading = true
+      console.log(sliderX, this.slideOptions.sliderY)
+      let _api
+      if (this.apiType === 'update') {
+        _api = getUpdatePhoneCode
+      } else if (this.apiType === 'privacy') {
+        _api = getPrivacyCode
+      } else {
+        _api = getCode
+      }
+      _api({ phone: this.phone, x: sliderX, y: this.slideOptions.sliderY, xxx: sliderKey })
+        .then((res) => {
+          this.$emit('success-verify', true)
+          this.slideLoading = false
+          done()
+          if (!this.codeTimer) {
+            this.codeLoading = true
+            this.codeCount = 60
+            this.codeTimer = setInterval(() => {
+              if (this.codeCount > 1 && this.codeCount <= 60) {
+                this.codeCount--
+              } else {
+                clearInterval(this.codeTimer) // 清除定时器
+                this.codeTimer = null
+                this.codeLoading = false
+              }
+            }, 1000)
+          }
+          this.isShowGraphicVerificationDialog = false
+          this.$message({
+            message: '发送成功，请注意查看手机短信',
+            type: 'success'
+          })
+        })
+        .catch(() => {
+          this.slideLoading = false
+          error()
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.graphic-verification-code-container {
+	width: 100%;
+	box-sizing: border-box;
+}
+</style>

src/router/index.js

@@ -396,17 +396,6 @@ import Layout from '@/layout'
 //       icon: 'table'
 //     }
 //   },
-//   // pendDetails
-//   {
-//     hidden: true, // (默认 false)
-//     path: 'pendDetails',
-//     name: 'pendDetails',
-//     component: () => import('@/views/order/pending/pendDetails'),
-//     meta: {
-//       title: '订单详情',
-//       icon: 'table'
-//     }
-//   },
 //   {
 //     path: 'after',
 //     name: 'after',

src/views/active/combinationActivityConfiguration/components/EditModal.vue

@@ -12,7 +12,7 @@
       <el-form-item label="活动配置类型" prop="configType">
         <el-select
           v-model="formData.configType" clearable size="mini" placeholder="请选择活动配置类型"
-          @change="formData.roleType = formData.ruleId = formData.joinRule = formData.joinMoney = formData.isCardHolder = formData.serverId = ''"
+          @change="formData.roleType = formData.ruleId = formData.joinRule = formData.joinMoney = formData.isCardHolder = formData.serverId = []"
         >
           <el-option label="升级活动" :value="1" />
           <el-option label="分佣活动" :value="2" />
@@ -90,12 +90,16 @@
         v-if="[ 3 ].includes(formData.configType) && (formData.joinRole === 1)" label="社区服务"
         prop="serverId"
       >
-        <el-select v-model="formData.serverId" clearable size="mini" placeholder="请选择社区服务" filterable>
+        <el-select
+          v-model="formData.serverId" clearable size="mini"
+          placeholder="请选择社区服务" filterable multiple
+          @change="(e) => (formData.cardBusinessFields = JSON.stringify(communityList.filter(i => formData.serverId.includes(i.id))))"
+        >
           <el-option
             v-for="(item, index) in communityList" :key="item.id"
             :label="`${item.serverInfoName || '--'}（${item.id}）`" :value="item.id"
           />
-        </el-select>
+        </el-select>{{ formData.serverId }}
       </el-form-item>
       <el-form-item
         v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1)"
@@ -179,8 +183,9 @@
         ></el-cascader>
         <div v-if="String(formData.cardJson)">已选ID：{{ formData.cardJson }}</div>
       </el-form-item>
+      <!-- && formData.isCardHolder -->
       <el-form-item
-        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1) && formData.isCardHolder"
+        v-if="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(formData.configType) && (formData.joinRole === 1)"
         label="业务json字段" prop="cardBusinessFields"
       >
         <el-input
@@ -234,7 +239,7 @@ export default {
         cardRange: '',
         cardJson: '',
         cardBusinessFields: '',
-        serverId: ''
+        serverId: [] // 非后端参数
       },
       formRules: {
         composeId: [
@@ -341,8 +346,7 @@ export default {
           cardEffectiveTime: res.data.cardEffectiveTime || '',
           cardRange: res.data.cardRange || '',
           cardJson: res.data.cardJson || '',
-          cardBusinessFields: res.data.cardBusinessFields || '',
-          serverId: res.data.serverId || ''
+          cardBusinessFields: res.data.cardBusinessFields || ''
         })
         if (this.formData.cardJson) this.regionArrDialog = this.formData.cardJson.split(',').map((i) => [ i ])
         this.$nextTick(() => {

src/views/business/businessList/components/DetailModal.vue

@@ -8,6 +8,17 @@
       <el-form-item label="店铺名称" prop="shopName">
         {{ formData.shopName || '--' }}
       </el-form-item>
+      <el-form-item label="是否支持代金券" prop="isVoucher">
+        <span v-if="formData.isVoucher === 1">允许</span>
+        <span v-else-if="formData.isVoucher === 2">拒绝</span>
+        <span v-else>--</span>
+      </el-form-item>
+      <el-form-item label="请输入代金券返还比例" prop="voucherReturn">
+        {{ formData.voucherReturn || '--' }}%
+      </el-form-item>
+      <el-form-item label="代金券提现比例" prop="voucherCoinRatio">
+        {{ formData.voucherCoinRatio || '--' }}
+      </el-form-item>
       <el-form-item label="是否支持消费金" prop="isBeeCoin">
         <span v-if="formData.isBeeCoin === 1">支持</span>
         <span v-else-if="formData.isBeeCoin === 2">不支持</span>
@@ -64,14 +75,6 @@
         <span v-else-if="formData.shopType === 2">本地</span>
         <span v-else>--</span>
       </el-form-item>
-      <el-form-item label="是否支持代金券" prop="isVoucher">
-        <span v-if="formData.isVoucher === 1">允许</span>
-        <span v-else-if="formData.isVoucher === 2">拒绝</span>
-        <span v-else>--</span>
-      </el-form-item>
-      <el-form-item label="请输入代金券返还比例" prop="voucherReturn">
-        {{ formData.voucherReturn || '--' }}%
-      </el-form-item>
       <el-form-item label="惠市宝商家编号" prop="hsbMrchId">
         {{ formData.hsbMrchId || '--' }}
       </el-form-item>
@@ -137,6 +140,7 @@ export default {
       formData: {
         shopId: '',
         shopName: '', // 店铺名称
+        voucherCoinRatio: '', // 代金券提现比例
         isBeeCoin: '', // 是否支持消费金
         beeCoinRatio: '', // 商家消费金提现比例
         chargePersonName: '', // 店铺负责人

src/views/business/businessList/components/EditModal.vue

@@ -2,13 +2,37 @@
   <div>
     <el-dialog :visible.sync="visible" v-bind="modalOptions">
       <div>
-        <el-form ref="formData" :model="formData" :rules="formRules" size="mini" label-suffix=":" label-width="150px">
+        <el-form ref="formData" :model="formData" :rules="formRules" size="mini" label-suffix=":" label-width="160px">
           <div>
             <el-tabs v-model="activeName">
               <el-tab-pane label="授权信息" name="first">
                 <el-form-item label="店铺名称" prop="shopName">
                   <el-input v-model="formData.shopName" maxlength="20" />
                 </el-form-item>
+                <el-form-item label="是否支持代金券" prop="isVoucher">
+                  <el-radio-group v-model="formData.isVoucher">
+                    <el-radio :label="1">
+                      允许
+                    </el-radio>
+                    <el-radio :label="2">
+                      拒绝
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item
+                  v-if="formData.isVoucher === 1" :rules="[
+                    { required: true, message: '请输入代金券返还比例', trigger: 'blur' },
+                    { type: 'number', max: 100, min: 0, message: '请输入正确的代金券返还比例，0 ~ 100', trigger: ['blur', 'change'] }
+                  ]" label="代金券返还比例" prop="voucherReturn"
+                >
+                  <el-input v-model.number="formData.voucherReturn" style="width: 200px;" placeholder="请填写代金券返还比例，范围0 ~ 100">
+                    <template #append>%</template>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="代金券提现比例" prop="voucherCoinRatio">
+                  <el-input-number v-model="formData.voucherCoinRatio" :precision="2" :step="0.01" :max="1"></el-input-number>
+                  <span style="margin-left: 10px;">比例*100</span>
+                </el-form-item>
                 <el-form-item label="是否支持消费金" prop="isBeeCoin">
                   <el-radio-group v-model="formData.isBeeCoin">
                     <el-radio :label="1">支持</el-radio>
@@ -108,26 +132,6 @@
                   >
                   </el-time-select>
                 </el-form-item>
-                <el-form-item label="是否支持代金券" prop="isVoucher">
-                  <el-radio-group v-model="formData.isVoucher">
-                    <el-radio :label="1">
-                      允许
-                    </el-radio>
-                    <el-radio :label="2">
-                      拒绝
-                    </el-radio>
-                  </el-radio-group>
-                </el-form-item>
-                <el-form-item
-                  v-if="formData.isVoucher === 1" :rules="[
-                    { required: true, message: '请输入代金券返还比例', trigger: 'blur' },
-                    { type: 'number', max: 100, min: 0, message: '请输入正确的代金券返还比例，0 ~ 100', trigger: ['blur', 'change'] }
-                  ]" label="代金券返还比例" prop="voucherReturn"
-                >
-                  <el-input v-model.number="formData.voucherReturn" placeholder="请填写代金券返还比例，范围0 ~ 100">
-                    <template #append>%</template>
-                  </el-input>
-                </el-form-item>
                 <el-form-item label="惠市宝商家编号">
                   <el-input v-model="formData.hsbMrchId" maxlength="60" />
                 </el-form-item>
@@ -174,10 +178,10 @@
                     :action="uploadUrl"
                     :on-success="(r) => formData.advertisement.push({ url: r.url, uid: r.url + Math.random() + Date.now() })"
                     :on-remove="(e) => formData.advertisement.filter((item) => item.uid !== e.uid)"
-                  >
+                    >
                     <i class="el-icon-plus avatar-uploader-icon" />
-                  </el-upload> -->
-                  
+                    </el-upload> -->
+
                   <el-upload
                     class="avatar-uploader" list-type="picture-card" :file-list="uploadList"
                     :action="uploadUrl"
@@ -242,6 +246,7 @@ export default {
       formData: {
         shopId: '',
         shopName: '', // 店铺名称
+        voucherCoinRatio: '', // 代金券提现比例
         isBeeCoin: '', // 是否支持消费金
         beeCoinRatio: '', // 商家消费金提现比例
         chargePersonName: '', // 店铺负责人
@@ -329,7 +334,7 @@ export default {
       },
       uploadUrl,
       categoryList: [],
-      uploadList:[]
+      uploadList: []
     }
   },
   watch: {
@@ -390,20 +395,18 @@ export default {
         const res = await businessListGetById({ shopId: id })
         this.formData = Object.assign(this.$options.data().formData, res.data, {
           shopId: res.data.shopId || '',
-          voucherReturn:Number(res.data.voucherReturn)
+          voucherReturn: Number(res.data.voucherReturn)
           // advertisement: res.data.advertisement ? res.data.advertisement.split(',').map((item) => ({ url: item, uid: item + Math.random() + new Date() })) : []
           // advertisement
         })
-        let arr = this.formData.advertisement.split(",");
-        if(arr[0] == ""){
+        const arr = this.formData.advertisement.split(',')
+        if (arr[0] == '') {
           this.uploadList = []
-        }else{
-          this.uploadList = arr.map(item=>{
-          return {
+        } else {
+          this.uploadList = arr.map((item) => ({
             url: item,
             uid: item + Math.random() + new Date()
-          }
-        })
+          }))
         }
         const categoryItem = XeUtils.findTree(this.categoryList, (item) => item.id === String(res.data.classificationId))
         if (categoryItem && Array.isArray(categoryItem.nodes)) {
@@ -428,12 +431,12 @@ export default {
               // advertisement: Array.isArray(advertisement) ? advertisement.map((v) => v.url || v).join(',') : '',
               classificationId: Array.isArray(classificationArr) && classificationArr.length ? classificationArr[classificationArr.length - 1] : ''
             }
-            params.advertisement = this.uploadList.reduce((prev,item,index)=>{
-              prev += item.url + ","
+            params.advertisement = this.uploadList.reduce((prev, item, index) => {
+              prev += item.url + ','
               return prev
-            },"")
+            }, '')
             //  删除最后一个字符
-            params.advertisement = params.advertisement.substring(0,params.advertisement.length - 1)
+            params.advertisement = params.advertisement.substring(0, params.advertisement.length - 1)
             this.formData.shopId ? await businessListUpdate(params) : await businessListSave(params)
             loading.close()
             this.$message({ message: `${this.formData.shopId ? '编辑' : '添加'}成功!`, type: 'success' })
@@ -450,12 +453,12 @@ export default {
         }
       })
     },
-    uploadSuccess(r){
-      console.log(r);
-      this.uploadList.push({url:r.data.url,uid: r.url + Math.random() + Date.now()})
+    uploadSuccess(r) {
+      console.log(r)
+      this.uploadList.push({ url: r.data.url, uid: r.url + Math.random() + Date.now() })
     },
-    removeSuccess(r){
-      this.uploadList = this.uploadList.filter(item => item.uid !== r.uid)
+    removeSuccess(r) {
+      this.uploadList = this.uploadList.filter((item) => item.uid !== r.uid)
     }
   }
 }

src/views/business/businessList/index.vue

@@ -50,8 +50,8 @@
         <el-table-column label="店铺名称" width="200" align="center">
           <template slot-scope="scope">{{ scope.row.shopName }}</template>
         </el-table-column>
-        <el-table-column prop="shopCode" label="店铺编码" />
-        <el-table-column label="是否支持消费金">
+        <el-table-column width="120" prop="shopCode" label="店铺编码" />
+        <el-table-column width="120" label="是否支持消费金">
           <template slot-scope="scope">
             <span v-if="scope.row.isBeeCoin === 1">支持</span>
             <span v-else-if="scope.row.isBeeCoin === 2">不支持</span>
@@ -65,14 +65,14 @@
           </template>
           </el-table-column> -->
         <el-table-column prop="chargePersonName" label="负责人" />
-        <el-table-column prop="chargePersonPhone" label="联系电话" />
+        <el-table-column width="120" prop="chargePersonPhone" label="联系电话" />
         <el-table-column label="合同状态">
           <template slot-scope="scope">
             <span v-if="scope.row.contractState === 0">无效</span>
             <span v-if="scope.row.contractState === 1">有效</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" />
+        <el-table-column width="150" prop="createTime" label="创建时间" />
         <el-table-column align="center" label="操作" width="280" fixed="right" class-name="small-padding fixed-width">
           <template slot-scope="{ row }">
             <el-button type="warning" size="mini" @click="handleDetail(row)">

src/views/finance/application/index.vue

@@ -32,8 +32,10 @@
       <!--  表格 -->
       <div class="content_table">
         <div class="table">
-          <el-table :data="tableData" v-loading="tableLoading" border
-            :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" style="width: 100%">
+          <el-table
+            v-loading="tableLoading" :data="tableData" border
+            :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" style="width: 100%"
+          >
             >
             <el-table-column prop="orderSn" label="流水号"></el-table-column>
             <el-table-column prop="name" label="用户名称" />
@@ -64,28 +66,35 @@
             </el-table-column>
           </el-table>
           <div class="fenye">
-            <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" :page-size="10"
+            <el-pagination
+              :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" :page-size="10"
               layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
-              @current-change="handleCurrentChange" />
+              @current-change="handleCurrentChange"
+            />
           </div>
         </div>
       </div>
     </div>
-    <!-- *****************弹框开始***************** -->
+
     <!-- 详情弹框 -->
-    <el-dialog :visible.sync="dioObj.show" :title="dioObj.title" width="40%" center :close-on-click-modal="false"
-      @close="closeDialog">
+    <el-dialog
+      :visible.sync="dioObj.show" :title="dioObj.title" width="40%" center
+      :close-on-click-modal="false"
+      @close="closeDialog"
+    >
       <div class="box">
         <div class="dioBox">
           <div v-for="(item, index) in infoList" :key="index" class="inner">{{ item.name }}:{{ item.value }}</div>
         </div>
         <div v-if="dioObj.type === 2" class="botTitle">*请确认您已转账成功，再点击确认</div>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button v-if="dioObj.type === 2" type="primary" @click="agreeEn(1)">{{ confirmInfo }}</el-button>
-        <el-button v-if="dioObj.type === 2" type="danger" @click="agreeEn(2)">拒绝打款</el-button>
-        <el-button v-if="dioObj.type === 1" @click="closeDialog">关 闭</el-button>
-      </span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button v-if="dioObj.type === 2" type="primary" @click="agreeEn(1)">{{ confirmInfo }}</el-button>
+          <el-button v-if="dioObj.type === 2" type="danger" @click="agreeEn(2)">拒绝打款</el-button>
+          <el-button v-if="dioObj.type === 1" @click="closeDialog">关 闭</el-button>
+        </span>
+      </template>
       <div class="statistics">
         <div class="statistics-item">
           <h1>{{ watherInfo.price }}</h1>
@@ -105,8 +114,10 @@
         </div>
       </div>
       <div class="tabbar-list">
-        <el-table :data="waterData" v-loading="watherFlag" border
-          :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" style="width: 100%">
+        <el-table
+          v-loading="watherFlag" :data="waterData" border
+          :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" style="width: 100%"
+        >
           >
           <el-table-column prop="price" label="支付金额"></el-table-column>
           <el-table-column prop="paymentTime" label="支付时间" />
@@ -141,8 +152,6 @@
 </template>
 
 <script>
-// import { getShopId } from '@/utils/auth'
-import { hidden } from '@/utils/index'
 import {
   applicationGetAll,
   applicationGetById,
@@ -152,6 +161,7 @@ import {
   getTonglian
 } from '@/api/application'
 export default {
+  name: 'Application',
   data() {
     return {
       formInline: {
@@ -171,7 +181,7 @@ export default {
         { name: '银行卡号', value: '', fields: 'bankCard' },
         { name: '收款人姓名', value: '', fields: 'name' },
         { name: '提现金额', value: '', fields: 'withdrawalMoney' },
-        { name: "实际到账", value: '', fields: "actualReceipt" },
+        { name: '实际到账', value: '', fields: 'actualReceipt' },
         { name: '申请时间', value: '', fields: 'applyTime' },
         { name: '处理时间', value: '', fields: 'handleTime' }
       ],
@@ -179,9 +189,9 @@ export default {
       multipleSelection: [],
       dioObj: {},
       //  拒绝打款理由
-      rejectReason: "",
+      rejectReason: '',
       //  控制确认信息和确认打款
-      confirmInfo: "确认信息",
+      confirmInfo: '确认信息',
       // 流水信息表格数据
       waterData: [],
       waterTotal: null,
@@ -190,8 +200,7 @@ export default {
       watherParameter: {
         page: 1,
         pageSize: 5,
-        // buyerUserId: ""
-        acquirerId: ""
+        acquirerId: ''
       },
       watherFlag: true
     }
@@ -228,18 +237,6 @@ export default {
       }
       this.getAll(this.formInline)
     },
-    async getTopList(o) {
-      this.infoList.map((item) => {
-        item.value = o[item.fields]
-      })
-      //  在这里获取统计的流水
-      try {
-        let res = await getUserWater({ userId: o.buyerUserId })
-        this.watherInfo = res.data
-      } catch (error) {
-      }
-      this.getWatherTable(o.buyerUserId)
-    },
     // 查看
     seeMore(row) {
       this.dioObj = {
@@ -263,14 +260,14 @@ export default {
     // 确认
     async agreeEn(index) {
       // console.log(index)
-      if (index === 1 && this.confirmInfo == "确认信息") {
+      if (index === 1 && this.confirmInfo == '确认信息') {
         const res = await applicationHandle({
           withdrawalId: this.dioObj.arr.withdrawalId,
           state: 1
-        });
+        })
         this.$message.success('确认信息成功，请确认打款')
-        this.confirmInfo = "确认打款";
-      } else if (index === 1 && this.confirmInfo == "确认打款") {
+        this.confirmInfo = '确认打款'
+      } else if (index === 1 && this.confirmInfo == '确认打款') {
         this.$confirm('此操作将把款项打给用户, 是否继续?', '打款', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -278,21 +275,23 @@ export default {
         }).then(async () => {
           const res = await applicationHandle({
             withdrawalId: this.dioObj.arr.withdrawalId,
+            withdrawalType: 1, // 1佣金
             state: 3
-          });
+          })
           if (res.code === '') {
             this.$message.success('确认打款成功')
             this.dioObj.show = false
             this.getAll(this.formInline)
           }
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消打款'
-          });
-        });
+        })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消打款'
+            })
+          })
       } else if (index === 2) {
-        if (this.rejectReason == "") {
+        if (this.rejectReason == '') {
           this.$prompt('请输入拒绝打款理由', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -316,17 +315,18 @@ export default {
                 this.dioObj.show = false
                 this.getAll(this.formInline)
               }
-            }).catch(() => {
-              this.$message({
-                type: 'info',
-                message: '已取消拒绝打款'
-              });
-            });
-            this.infoList.push({ name: "拒绝打款理由", value: value, fields: 'rejectReason' })
-
-          }).catch(() => {
-            this.rejectReason = ""
-          });
+            })
+              .catch(() => {
+                this.$message({
+                  type: 'info',
+                  message: '已取消拒绝打款'
+                })
+              })
+            this.infoList.push({ name: '拒绝打款理由', value, fields: 'rejectReason' })
+          })
+            .catch(() => {
+              this.rejectReason = ''
+            })
           return false
         }
       }
@@ -340,25 +340,28 @@ export default {
       }
       //  判断是不是有拒绝打款理由
       if (res.data.rejectReason && res.data.state == 2 || res.data.rejectReason && res.data.state == 4) {
-        this.infoList.push({ name: "拒绝打款理由", value: res.data.rejectReason, fields: 'rejectReason' })
+        this.infoList.push({ name: '拒绝打款理由', value: res.data.rejectReason, fields: 'rejectReason' })
       }
     },
+    async getTopList(o) {
+      this.infoList.map((item) => {
+        item.value = o[item.fields]
+      })
+      //  在这里获取统计的流水
+      const res = await getUserWater({ userId: o.buyerUserId })
+      this.watherInfo = res.data
+      this.getWatherTable(o.buyerUserId)
+    },
 
     //  通联确认
     async confirmTong(item) {
-      let obj = {
+      const obj = {
         orderSn: item.orderSn,
         withdrawalId: item.withdrawalId
       }
-      try {
-        let res = await getTonglian(obj);
-        if (res.code === '') {
-          this.$message.success('通联确认成功')
-          this.getAll(this.formInline)
-        }
-      } catch (error) {
-
-      }
+      await getTonglian(obj)
+      this.$message.success('通联确认成功')
+      this.getAll(this.formInline)
     },
     // 初始化查询所有数据
     async getAll(formInline) {
@@ -369,7 +372,7 @@ export default {
       this.tableLoading = false
       this.tableData = res.data.list
       this.tableData.forEach((item) => {
-        item.phone = hidden(item.phone, 3, 4)
+        item.phone = item.phone.replace(/(\d{3})\d+(\d{4})$/, '$1****$2')
       })
       this.total = res.data.total
     },
@@ -378,14 +381,10 @@ export default {
       this.watherFlag = true
       //  获取流水表格数据
       this.watherParameter.acquirerId = id
-      try {
-        let res = await getWaterRecord(this.watherParameter)
-        this.waterData = res.data.list
-        this.waterTotal = res.data.total
-        this.watherFlag = false
-      } catch (error) {
-
-      }
+      const res = await getWaterRecord(this.watherParameter)
+      this.waterData = res.data.list
+      this.waterTotal = res.data.total
+      this.watherFlag = false
     },
     //  表格分页
     waterChange(e) {
@@ -395,12 +394,12 @@ export default {
     //  关闭弹窗的回调
     closeDialog() {
       this.dioObj.show = false
-      this.rejectReason = "";
-      this.confirmInfo = "确认信息";
+      this.rejectReason = ''
+      this.confirmInfo = '确认信息'
       // 清除流水表格信息 以及 load加载状态
       this.waterData = []
-      console.log(this.dioObj);
-      this.infoList = this.infoList.filter(item => item.fields != 'rejectReason');
+      console.log(this.dioObj)
+      this.infoList = this.infoList.filter((item) => item.fields != 'rejectReason')
     }
   }
 }
@@ -410,49 +409,49 @@ export default {
 @import url("../../../styles/elDialog.scss");
 
 .custom_page {
-  padding: 20px;
+	padding: 20px;
 }
 
 .box {
-  .dioBox {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    flex-wrap: wrap;
+	.dioBox {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		flex-wrap: wrap;
 
-    .inner {
-      width: 50%;
-      padding: 20px;
-    }
-  }
+		.inner {
+			width: 50%;
+			padding: 20px;
+		}
+	}
 
-  .botTitle {
-    color: red;
-    text-align: center;
-  }
+	.botTitle {
+		color: red;
+		text-align: center;
+	}
 }
 
 .statistics {
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  width: 100%;
-  margin: 10px 0 15px;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	width: 100%;
+	margin: 10px 0 15px;
 
-  .statistics-item {
-    text-align: center;
+	.statistics-item {
+		text-align: center;
 
-    h1 {
-      color: #ffae11;
-      font-size: 20px;
-    }
-  }
+		h1 {
+			color: #ffae11;
+			font-size: 20px;
+		}
+	}
 }
 
 .dialog-pagination {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 15px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-top: 15px;
 }
 </style>

src/views/finance/withdrawal/components/WithdrawalProcessing.vue

@@ -76,10 +76,10 @@
     <template #footer>
       <span>
         <el-button @click="visible = false">取 消</el-button>
-        <el-button v-if="formData.state == 3" type="danger" @click="handleRefuse">确认拒绝打款</el-button>
+        <el-button v-if="formData.state === 3" type="danger" @click="handleRefuse">确认拒绝打款</el-button>
         <el-button v-else type="danger" @click="handleRefuse">拒绝打款</el-button>
-        <el-button v-if="formData.state == 2" type="primary" @click="handleConfirm">确认打款</el-button>
-        <el-button v-else type="primary" @click="handleConfirm">确认用户信息</el-button>
+        <el-button v-if="formData.state === 0" type="primary" @click="handleExamine">确认用户信息</el-button>
+        <el-button v-else-if="formData.state === 2" type="primary" @click="handleConfirm">确认打款</el-button>
       </span>
     </template>
   </el-dialog>
@@ -101,6 +101,7 @@ export default {
       },
       visible: false,
       formData: {
+        withdrawalId: '',
         shopName: '',
         shopCode: '',
         bankName: '',
@@ -130,6 +131,7 @@ export default {
     },
     handleOpen(params = {}) {
       this.modalOptions.title = '提现处理'
+      this.formData = Object.assign(this.$options.data().formData, params)
       this.visible = true
       this.initList()
       if (params.withdrawalId) {
@@ -143,6 +145,7 @@ export default {
       try {
         const res = await withdrawalGetById({ withdrawalId: id })
         this.formData = Object.assign(this.$options.data().formData, res.data, {
+          withdrawalId: res.data.withdrawalId || '',
           shopName: res.data.shopName || '',
           shopCode: res.data.shopCode || '',
           bankName: res.data.bankName || '',
@@ -187,25 +190,38 @@ export default {
         this.$message.warning('请填写理由并确定拒绝打款！！！')
       }
     },
-    // 确认打款
-    async handleConfirm() {
-      if (this.formData.state == 2) {
-        if (!this.formData.type) return this.$message.error('请选择打款方式')
-        const res = await withdrawalHandle({
-          withdrawalId: this.formData.withdrawalId,
-          state: '2',
-          audit: 1,
-          type: this.formData.type
+    // 确认审核
+    handleExamine() {
+      this.$confirm('确定审核通过吗？')
+        .then(async () => {
+          await withdrawalHandle({
+            withdrawalId: this.formData.withdrawalId,
+            state: '0',
+            audit: 1,
+            type: ''
+          })
+          this.$message.success('操作成功！请再次确认！')
+          this.getInfo(this.formData.withdrawalId)
+          this.$emit('success')
         })
-        if (res.code == '') {
+        .catch(() => {})
+    },
+    // 确认打款
+    handleConfirm() {
+      this.$confirm('确定打款吗？')
+        .then(async () => {
+          if (!this.formData.type) return this.$message.error('请选择打款方式')
+          await withdrawalHandle({
+            withdrawalId: this.formData.withdrawalId,
+            state: '2',
+            audit: 1,
+            type: this.formData.type
+          })
           this.$message.success('打款成功！！！')
-        }
-        this.visible = false
-        this.$emit('success')
-      } else {
-        this.formData.state = 2
-        this.$message.warning('请再次确认！！！')
-      }
+          this.visible = false
+          this.$emit('success')
+        })
+        .catch(() => {})
     }
   }
 }

src/views/login/index.vue

@@ -64,17 +64,11 @@
               />
             </el-form-item>
             <el-form-item prop="code">
-              <el-input
-                v-model="anthorForm.code" maxlength="6" type="text" class="iptHeight"
-                auto-complete="off"
-                style="width: 63%" placeholder="请输入验证码" @keyup.enter.native="anhandleLogin"
-              />
-              <div class="login-code">
-                <el-button class="codeBtn" type="primary" :loading="codeloading" @click="getCode(anthorForm.username)">
-                  <span v-if="!codeloading">获取验证码</span>
-                  <span v-else>{{ count }} s</span>
-                </el-button>
-              </div>
+              <GraphicVerificationCode
+                :phone="anthorForm.username"
+                @input="(e) => anthorForm.code = e"
+                @enter-down="anhandleLogin"
+              ></GraphicVerificationCode>
             </el-form-item>
             <div class="boxBottom">
               <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">自动登录</el-checkbox>
@@ -98,66 +92,60 @@
     <div v-else class="loginBoxs">
       <div class="topback">找回密码</div>
       <el-card class="box-card">
-        <div slot="header" class="clearfix">
-          <span style="margin-left: 25px">找回密码</span>
-          <el-button
-            style="float: right; padding: 3px 0" type="text" @click=" {
-              getPassword = true;
-            }
-            "
-          >
-            返回登录
-          </el-button>
-          <div class="cardBox">
-            <el-form
-              ref="forgotForm" :model="forgotPasswordForm" :rules="forgotPasswordRules" label-position="left"
-              label-width="0px" class="login-form"
+        <template #header>
+          <div class="clearfix">
+            <span style="margin-left: 25px">找回密码</span>
+            <el-button
+              style="float: right; padding: 3px 0" type="text" @click=" {
+                getPassword = true;
+              }
+              "
             >
-              <el-form-item prop="phone">
-                <el-input
-                  v-model="forgotPasswordForm.phone" type="text" maxlength="11" auto-complete="off"
-                  placeholder="请输入手机号码" class="iptHeight"
-                />
-              </el-form-item>
-              <el-form-item prop="code">
-                <el-input
-                  v-model="forgotPasswordForm.code" maxlength="6" type="text" class="iptHeight"
-                  auto-complete="off" style="width: 63%" placeholder="请输入验证码"
-                />
-                <div class="login-code">
+              返回登录
+            </el-button>
+            <div class="cardBox">
+              <el-form
+                ref="forgotForm" :model="forgotPasswordForm" :rules="forgotPasswordRules" label-position="left"
+                label-width="0px" class="login-form"
+              >
+                <el-form-item prop="phone">
+                  <el-input
+                    v-model="forgotPasswordForm.phone" type="text" maxlength="11" auto-complete="off"
+                    placeholder="请输入手机号码" class="iptHeight"
+                  />
+                </el-form-item>
+                <el-form-item prop="code">
+                  <GraphicVerificationCode
+                    :phone="forgotPasswordForm.phone"
+                    @input="(e) => forgotPasswordForm.code = e"
+                    @enter-down="anhandleLogin"
+                  ></GraphicVerificationCode>
+                </el-form-item>
+                <el-form-item prop="password">
+                  <el-input
+                    v-model="forgotPasswordForm.password" type="password" maxlength="16" auto-complete="off"
+                    placeholder="请输入密码" class="iptHeight"
+                  />
+                </el-form-item>
+                <el-form-item prop="newPassword">
+                  <el-input
+                    v-model="forgotPasswordForm.newPassword" type="password" maxlength="16" auto-complete="off"
+                    placeholder="请再次输入密码" class="iptHeight"
+                  />
+                </el-form-item>
+                <el-form-item style="width: 100%">
                   <el-button
-                    class="codeBtn" type="primary" :loading="codeloading"
-                    @click="getCode(forgotPasswordForm.phone)"
+                    :loading="loading" size="medium" type="primary" style="width: 100%; border-radius: 20px"
+                    @click.native.prevent="resetPassword"
                   >
-                    <span v-if="!codeloading">获取验证码</span>
-                    <span v-else>{{ count }} s</span>
+                    <span v-if="!loading">重 置 密 码</span>
+                    <span v-else>重 置 中...</span>
                   </el-button>
-                </div>
-              </el-form-item>
-              <el-form-item prop="password">
-                <el-input
-                  v-model="forgotPasswordForm.password" type="password" maxlength="16" auto-complete="off"
-                  placeholder="请输入密码" class="iptHeight"
-                />
-              </el-form-item>
-              <el-form-item prop="newPassword">
-                <el-input
-                  v-model="forgotPasswordForm.newPassword" type="password" maxlength="16" auto-complete="off"
-                  placeholder="请再次输入密码" class="iptHeight"
-                />
-              </el-form-item>
-              <el-form-item style="width: 100%">
-                <el-button
-                  :loading="loading" size="medium" type="primary" style="width: 100%; border-radius: 20px"
-                  @click.native.prevent="resetPassword"
-                >
-                  <span v-if="!loading">重 置 密 码</span>
-                  <span v-else>重 置 中...</span>
-                </el-button>
-              </el-form-item>
-            </el-form>
+                </el-form-item>
+              </el-form>
+            </div>
           </div>
-        </div>
+        </template>
       </el-card>
     </div>
     <!--  底部  -->
@@ -166,11 +154,13 @@
 </template>
 
 <script>
-import { getCode } from '@/api/user'
-const TIME_COUNT = 60 // 更改倒计时时间
+import GraphicVerificationCode from '@/components/GraphicVerificationCode/index.vue'
 const JM = require('@/utils/rsaEncrypt.js')
 export default {
   name: 'Login',
+  components: {
+    GraphicVerificationCode
+  },
   data() {
     var validateNewPassword = (rule, value, callback) => {
       if (value !== this.forgotPasswordForm.password) {
@@ -240,9 +230,6 @@ export default {
         ]
       },
       loading: false,
-      codeloading: false,
-      count: '',
-      timer: null,
       redirect: null,
       getPassword: true
     }
@@ -260,40 +247,6 @@ export default {
     touchTab(index) {
       this.tabIndex = index
     },
-    // 获取验证码
-    async getCode(phone) {
-      console.log(phone)
-      if (phone === '' || phone === undefined) {
-        this.$message.error('请填写电话号码')
-        return
-      }
-      if (/^1[3456789]\d{9}$/.test(phone) === false) {
-        this.$message.error('请填写正确手机号')
-        return false
-      }
-      if (!this.timer) {
-        this.codeloading = true
-        this.count = TIME_COUNT
-        this.show = false
-        const res = await getCode({ phone })
-        if (res.code === '') {
-          this.$message({
-            message: '发送成功，请注意查看手机短信',
-            type: 'success'
-          })
-        }
-        this.timer = setInterval(() => {
-          if (this.count > 0 && this.count <= TIME_COUNT) {
-            this.count--
-          } else {
-            this.show = true
-            clearInterval(this.timer) // 清除定时器
-            this.timer = null
-            this.codeloading = false
-          }
-        }, 1000)
-      }
-    },
     // 忘记密码
     runForgetPassord() {
       this.getPassword = false

src/views/order/pending/pendDetails.vue → src/views/order/pending/components/pendDetails.vue

@@ -139,16 +139,9 @@
         <!-- 未发货时物流信息显示去发货按钮 -->
         <div v-show="order.logisticsName && order.logisticsNum" class="logistics_info">
           <h2>物流信息</h2>
-          <!-- <p
-            v-if="!order.logisticsNum"
-            class="send_good"
-            @click="send"
-            >
-            去发货
-            </p> -->
           <el-button
-            v-if="!order.logisticsNum && order.state == 2" type="primary" class="send_good"
-            @click="send"
+            v-if="!order.logisticsNum && (order.state == 2)" type="primary" class="send_good"
+            @click="handleSendGoods"
           >
             去发货
           </el-button>
@@ -157,14 +150,6 @@
               <span>物流公司: {{ order.logisticsName }}</span>
               <span>运单号: {{ order.logisticsNum }}</span>
             </p>
-            <!-- <p
-              v-for="(item, index) in tracesList"
-              :key="index"
-              class="logistics_item"
-              >
-              <span>{{ item.acceptTime }}</span>
-              <span>{{ acceptStation }}</span>
-              </p> -->
           </div>
         </div>
       </div>
@@ -214,6 +199,7 @@
 <script>
 import { orderGetById, orderGetSelect, orderDilevery } from '@/api/order'
 export default {
+  name: 'PendDetails',
   props: {
     detailRow: {
       type: Object,
@@ -224,7 +210,7 @@ export default {
     return {
       order: {},
       form: {
-        orderId: this.orderId,
+        orderId: '',
         express: '',
         deliverFormid: ''
       },
@@ -250,9 +236,9 @@ export default {
           this.form.orderId = nVal.orderId
           this.getProductList()
         }
-      }
-    },
-    deep: true
+      },
+      deep: true
+    }
   },
   created() {
     this.form.orderId = this.detailRow.orderId
@@ -263,9 +249,6 @@ export default {
       const res = await orderGetById({ orderId: this.detailRow.orderId })
       this.order = res.data
     },
-    close() {
-      this.$emit('cancel')
-    },
     confirm() {
       this.$refs.sendGoodsForm.validate((valid) => {
         if (valid) {
@@ -277,7 +260,7 @@ export default {
                 type: 'success'
               })
               this.isVisible = false
-              this.close()
+              this.$emit('cancel')
             }
           })
         }
@@ -292,7 +275,7 @@ export default {
         this.companyList = res.data
       }
     },
-    send() {
+    handleSendGoods() {
       this.getCompanyList()
       this.isVisible = true
     }
@@ -301,7 +284,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import url("../../../styles/elDialog.scss");
+@import url("../../../../styles/elDialog.scss");
 
 ul {
 	list-style: none;
@@ -311,13 +294,11 @@ ul {
 
 .order_details {
 	h3 {
-		// margin-left: 20px;
 		margin: 20px 0 20px 20px;
 		font-weight: 700;
 	}
 
 	.close {
-		// float: right;
 		position: absolute;
 		right: 20px;
 
@@ -385,10 +366,6 @@ ul {
 						}
 					}
 				}
-
-				.remarks {
-					margin-left: 30px !important;
-				}
 			}
 
 			.goods_info {
@@ -473,13 +450,6 @@ ul {
 							width: 45%;
 						}
 					}
-
-					.logistics_item {
-						span {
-							display: inline-block;
-							width: 30%;
-						}
-					}
 				}
 			}
 		}

src/views/order/pending/index.vue

@@ -1,122 +1,152 @@
 <!--  -->
 <template>
-  <div class="pending">
-    <div class="tabbar">
-      <el-radio-group v-model="tabPosition" style="margin: 30px 50px;">
-        <el-radio-button label="shopping">商城</el-radio-button>
-        <el-radio-button label="business">商圈</el-radio-button>
+  <div class="app-container">
+    <!-- 查询和其他操作 -->
+    <div class="filter-container">
+      <el-radio-group v-model="listQuery.orderType" class="filter-item" size="mini" @input="handleSetOrderType">
+        <el-radio-button :label="1">商城</el-radio-button>
+        <el-radio-button :label="2">商圈</el-radio-button>
       </el-radio-group>
+      <el-radio-group
+        v-if="listQuery.orderType === 1" v-model="listQuery.state" class="filter-item"
+        style="margin-left: 10px;" size="mini" @input="handleSearch"
+      >
+        <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="5">已关闭</el-radio-button>
+      </el-radio-group>
+      <el-radio-group
+        v-else-if="listQuery.orderType === 2" v-model="listQuery.state" class="filter-item"
+        style="margin-left: 10px;" size="mini" @input="handleSearch"
+      >
+        <el-radio-button label="">全部</el-radio-button>
+        <el-radio-button :label="5">已取消</el-radio-button>
+        <el-radio-button :label="8">待核销</el-radio-button>
+        <el-radio-button :label="9">待核销已付款</el-radio-button>
+        <el-radio-button :label="10">已核销</el-radio-button>
+      </el-radio-group>
+      <el-input
+        v-model="listQuery.search" clearable size="mini" class="filter-item"
+        style="display: inline-table;width: 400px;margin-left: 10px;"
+        placeholder="请输入内容"
+      >
+        <template #prepend>
+          <el-select v-model="listQuery.searchType" size="mini" style="width:150px" placeholder="请选择">
+            <el-option label="订单id" value="1" />
+            <el-option label="买家账户" value="2" />
+            <el-option label="收件人姓名" value="3" />
+            <el-option label="收件人手机号" value="4" />
+            <!-- <el-option label="商品ID" value="5" /> -->
+            <el-option label="下单号码" value="6" />
+          </el-select>
+        </template>
+      </el-input>
+      <el-input
+        v-model="listQuery.shopName" maxlength="20" clearable size="mini"
+        class="filter-item" style="width: 200px;margin-left: 10px;" placeholder="请输入商户名称"
+      />
+      <!-- <el-select
+        v-model="listQuery.afterState" clearable size="mini" class="filter-item"
+        style="width: 200px;margin-left: 10px;" placeholder="请选择售后状态"
+        >
+        <el-option label="全部" :value="null" />
+        <el-option label="无售后" value="0" />
+        <el-option label="售后中" value="1" />
+        <el-option label="售后成功" value="2" />
+        <el-option label="售后关闭" value="3" />
+        </el-select> -->
+      <el-date-picker
+        v-model="listQuery.dates" type="daterange" range-separator="至"
+        start-placeholder="开始时间" end-placeholder="结束时间" size="mini"
+        class="filter-item" style="margin-left: 10px;line-height: 1;"
+      />
+      <el-button
+        size="mini" class="filter-item" type="primary" icon="el-icon-search"
+        style="margin-left:10px;"
+        @click="handleSearch"
+      >
+        查找
+      </el-button>
+      <br />
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="exportExcelVisible = true">
+        导出订单
+      </el-button>
     </div>
-    <div class="tab_show">
-      <el-tabs v-model="formInline.state" @tab-click="handleClick">
-        <el-tab-pane :label="stateText[index]" :name="item == ''?'0':item" v-for="(item, index) in stateList" :key="item"></el-tab-pane>
-        <!-- <template v-else-if="tabPosition == 'business'">
-          <el-tab-pane label="全部" :name="''" />
-          <el-tab-pane label="已取消" name="5" />
-          <el-tab-pane label="待核销" name="8" />
-          <el-tab-pane label="待核销已付款" name="9" />
-          <el-tab-pane label="已核销" name="10" />
-        </template> -->
-      </el-tabs>
-      <!-- 搜索 -->
-      <div class="formSearch">
-        <el-form :inline="true" :model="formInline" class="demo-form-inline">
 
-          <el-form-item>
-            <div>
-              <el-input v-model="formInline.search" placeholder="请输入内容">
-                <el-select slot="prepend" v-model="formInline.searchType" style="width:130px" placeholder="请选择">
-                  <el-option label="订单id" value="1" />
-                  <el-option label="买家账户" value="2" />
-                  <el-option label="收件人姓名" value="3" />
-                  <el-option label="收件人手机号" value="4" />
-                  <el-option label="下单号码" value="6" />
-                  <!-- <el-option label="商品ID" value="5" /> -->
-                </el-select>
-              </el-input>
-            </div>
-          </el-form-item>
-          <el-form-item label="商户名称">
-            <el-input v-model="formInline.shopName" maxlength="20" placeholder="请输入" />
-          </el-form-item>
-          <!-- <el-form-item label="售后状态">
-            <el-select v-model="formInline.afterState" placeholder="请选择售后状态">
-              <el-option label="全部" :value="null" />
-              <el-option label="无售后" value="0" />
-              <el-option label="售后中" value="1" />
-              <el-option label="售后成功" value="2" />
-              <el-option label="售后关闭" value="3" />
-            </el-select>
-          </el-form-item> -->
-          <el-form-item label="下单时间">
-            <el-date-picker v-model="formInline.dates" type="daterange" range-separator="至" start-placeholder="开始日期"
-              end-placeholder="结束日期" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" plain @click="search">查询</el-button>
-            <el-button type="success" plain @click="exportExcelVisible = true">导出订单</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <!-- 表格 -->
-      <div class="tableBox">
-        <el-table ref="multipleTable" v-loading="tableLoading" :data="tableData" border stripe
-          @selection-change="handleSelectOrder" :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
-          tooltip-effect="dark" style="width: 100%">
-          <el-table-column type="selection" width="55">
-          </el-table-column>
-          <el-table-column label="订单id" width="150">
-            <template slot-scope="scope">{{ scope.row.orderId }}</template>
-          </el-table-column>
-          <el-table-column prop="customerPhone" label="下单号码" width="220" />
-          <el-table-column prop="number" label="商品数量" width="100" />
-          <el-table-column prop="orderFormid" label="订单编号" width="220" />
-          <el-table-column prop="scanType" label="订单类型" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span v-if="scope.row.scanType == 1">常规订单</span>
-              <span v-if="scope.row.scanType == 2">收款码订单</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="shopName" label="商户名称" width="220" show-overflow-tooltip />
-          <el-table-column prop="customerName" label="下单账户" show-overflow-tooltip />
-          <el-table-column prop="receiveName" label="收件人" show-overflow-tooltip />
-          <el-table-column prop="receivePhone" label="手机号" show-overflow-tooltip />
-          <el-table-column prop="price" label="支付金额（元）" width="120" />
-          <el-table-column prop="voucherPrice" label="抵扣金额" show-overflow-tooltip />
-          <el-table-column prop="createTime" label="下单时间" show-overflow-tooltip />
-          <el-table-column label="订单状态" min-width="120" show-overflow-tooltip>
-            <template slot-scope="scope">
-							<span v-if="scope.row.state == 1">待付款</span>
-							<span v-else-if="scope.row.state == 2">待发货</span>
-							<span v-else-if="scope.row.state == 3">待收货</span>
-							<span v-else-if="scope.row.state == 4">已完成</span>
-							<span v-else-if="scope.row.state == 5">交易关闭（已取消）</span>
-							<span v-else-if="scope.row.state == 6">待成团</span>
-							<span v-else-if="scope.row.state == 7">待售后</span>
-							<span v-else-if="scope.row.state == 8">待核销（未付款）</span>
-							<span v-else-if="scope.row.state == 9">待核销（已付款）</span>
-							<span v-else-if="scope.row.state == 10">已核销</span>
-							<span v-else>--</span>
-            </template>
-          </el-table-column>
+    <!-- 查询结果 -->
+    <div v-tableHeight>
+      <el-table
+        v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list"
+        v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
+        @selection-change="(e) => selectOrderIds = e"
+      >
+        <el-table-column align="center" width="55" type="selection">
+        </el-table-column>
+        <el-table-column align="center" width="120" label="订单ID" prop="orderId" fixed="left">
+          <template slot-scope="{ row }">
+            {{ row.orderId }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" width="220" label="订单编号" prop="orderFormid" fixed="left" />
+        <el-table-column align="center" label="下单时间" prop="createTime" show-overflow-tooltip />
+        <el-table-column align="center" width="180" label="下单号码" prop="customerPhone" />
+        <el-table-column align="center" label="下单账户" prop="customerName" show-overflow-tooltip />
+        <el-table-column align="center" width="220" label="商家名称" prop="shopName" show-overflow-tooltip />
+        <el-table-column align="center" width="220" label="支付金额（元）" prop="price" />
+        <el-table-column align="center" width="120" label="商家赠送代金券" prop="shopVoucher" show-overflow-tooltip />
+        <el-table-column align="center" width="120" label="平台赠送代金券" prop="platformVoucher" show-overflow-tooltip />
+        <el-table-column align="center" width="120" label="总赠送代金券" prop="presenterVoucher" show-overflow-tooltip />
+        <el-table-column align="center" width="120" label="代金券抵扣金额" prop="voucherPrice" show-overflow-tooltip />
+        <el-table-column align="center" min-width="120" label="订单状态" prop="state" show-overflow-tooltip>
+          <template slot-scope="{ row }">
+            <span v-if="row.state == 1">待付款</span>
+            <span v-else-if="row.state == 2">待发货</span>
+            <span v-else-if="row.state == 3">待收货</span>
+            <span v-else-if="row.state == 4">已完成</span>
+            <span v-else-if="row.state == 5">交易关闭（已取消）</span>
+            <span v-else-if="row.state == 6">待成团</span>
+            <span v-else-if="row.state == 7">待售后</span>
+            <span v-else-if="row.state == 8">待核销（未付款）</span>
+            <span v-else-if="row.state == 9">待核销（已付款）</span>
+            <span v-else-if="row.state == 10">已核销</span>
+            <span v-else>--</span>
+          </template>
+        </el-table-column>
 
-          <el-table-column label="操作" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <div class="btnList">
-                <el-button type="text" @click="seeMore(scope.row)">查看</el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="fenye">
-          <el-pagination :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10"
-            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
-            @current-change="handleCurrentChange" />
-        </div>
-      </div>
+        <el-table-column align="center" width="100" label="商品数量" prop="number" />
+        <el-table-column align="center" label="订单类型" prop="scanType" show-overflow-tooltip>
+          <template slot-scope="{ row }">
+            <el-tag v-if="row.scanType === 1" effect="plain">常规订单</el-tag>
+            <el-tag v-else-if="row.scanType === 2" effect="plain">收款码订单</el-tag>
+            <span v-else>--</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="收件人" prop="receiveName" show-overflow-tooltip />
+        <el-table-column align="center" label="手机号" prop="receivePhone" show-overflow-tooltip />
+        <el-table-column align="center" label="操作" width="120" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="{ row }">
+            <el-button type="warning" size="mini" @click="handleDetail(row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
+
+    <div>
+      <el-pagination
+        :current-page="listQuery.page" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"
+        @size-change="(val) => ((listQuery.pageSize = val) && getList())"
+        @current-change="(val) => ((listQuery.page = val) && getList())"
+      />
+    </div>
+
     <el-dialog title="订单详情" :visible.sync="detailVisible" width="74%" center :close-on-click-modal="false">
-      <OrderDetail :detail-row="form" @cancel="cancel" />
+      <OrderDetail :detail-row="form" @cancel="detailVisible = false" />
     </el-dialog>
 
     <el-dialog title="选择导出模版" :visible.sync="exportExcelVisible" center :close-on-click-modal="false">
@@ -124,31 +154,33 @@
         <el-radio :label="1">平台订单</el-radio>
         <el-radio :label="2">胖子发货订单</el-radio>
       </el-radio-group>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="exportExcelVisible = false">取 消</el-button>
-        <el-button type="primary" @click="orderDataExport" :loading="exportExcelLoading">{{ exportExcelLoading ?
-          '导出中...' : '确认导出' }}</el-button>
-      </span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="exportExcelVisible = false">取 消</el-button>
+          <el-button type="primary" :loading="exportExcelLoading" @click="handleDataExport">
+            {{ exportExcelLoading
+              ? '导出中...' : '确认导出' }}
+          </el-button>
+        </span>
+      </template>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import OrderDetail from '@/views/order/pending/pendDetails.vue'
+import OrderDetail from './components/pendDetails'
 import { orderGetAll, orderExport } from '@/api/order'
-import { async } from 'q'
 export default {
-  components: { OrderDetail },
+  name: 'Pending',
+  components: {
+    OrderDetail
+  },
   data() {
-    // 这里存放数据
     return {
-      activeName: 'first',
-      active: "first",
-      tabPosition: 'shopping',
-      //  存储状态
-      stateText: ["全部", "待付款", "待发货", "已发货", "已完成", "已关闭"],
-      stateList: ['', '1', '2', '3', '4', '5'],
-      formInline: {
+      list: [],
+      total: 0,
+      listLoading: true,
+      listQuery: {
         searchType: '1',
         search: '', // 搜索字段
         state: '',
@@ -156,13 +188,10 @@ export default {
         dates: [], // 下单时间数组
         page: 1,
         shopName: '',
-        pageSize: 10,
+        pageSize: 20,
         templateType: 1,
         orderType: 1
       },
-      total: 1,
-      tableData: [],
-      tableLoading: false,
       detailVisible: false,
       exportExcelVisible: false,
       form: {},
@@ -171,92 +200,50 @@ export default {
       selectOrderIds: []
     }
   },
-  // 生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-    this.getAll(this.formInline)
-    this.handleClick({ name: '' })
+  created() {
+    this.getList()
   },
-  watch: {
-    tabPosition(newVal, oldVal) {
-      if (newVal == "shopping") {
-        this.stateText = ["全部", "待付款", "待发货", "已发货", "已完成", "已关闭"]
-        this.stateList = ['', '1', '2', '3', '4', '5'];
-        this.formInline.orderType = 1
-      } else if (newVal == "business") {
-        this.stateText = ["全部", "已取消", "待核销", "待核销已付款", "已核销"]
-        this.stateList = ['', '5', '8', '9', '10']
-        this.formInline.orderType = 2
-      }
-      this.getAll(this.formInline)
-      this.handleClick({ name: '' })
-    },
-  },
-  // 方法集合
   methods: {
-    handleSizeChange(val) {
-      this.formInline.pageSize = val
-      this.getAll(this.formInline)
-    },
-    handleCurrentChange(val) {
-      this.formInline.page = val
-      this.getAll(this.formInline)
+    async getList() {
+      this.listLoading = true
+      try {
+        const res = await orderGetAll(this.listQuery)
+        this.list = res.data.list
+        this.total = res.data.total
+      } finally {
+        this.listLoading = false
+      }
     },
-    handleClick(tab, event) {
-      this.page = 1
-      this.formInline.state = tab.name
-      this.formInline.page = 1
-      this.getAll(this.formInline)
+    handleSetOrderType(e) {
+      this.listQuery.orderType = e
+      this.listQuery.state = ''
+      this.handleSearch()
     },
-    //  查询
-    search() {
-      this.total = 1
-      this.formInline.page = 1
-      this.getAll(this.formInline)
+    handleSearch() {
+      this.listQuery.page = 1
+      this.getList()
     },
-    // 详情
-    seeMore(row) {
+    handleDetail(row) {
       this.detailVisible = true
       this.form = row
-      // this.$router.push({
-      //   name: 'pendDetails',
-      //   params: { orderId: row.orderId }
-      // })
-    },
-    cancel() {
-      this.detailVisible = false
-    },
-    // 初始化查询所有数据
-    async getAll(formInline) {
-      this.tableLoading = true
-      let obj = JSON.parse(JSON.stringify(formInline))
-      console.log(obj);
-      if(obj.state == '0') obj.state = ''
-      const res = await orderGetAll(obj)
-      this.tableData = res.data.list
-      this.total = res.data.total
-      this.tableLoading = false
-    },
-
-    // 选择订单
-    handleSelectOrder(e) {
-      this.selectOrderIds = e
+      this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
     },
 
     // 导出订单
-    async orderDataExport() {
+    async handleDataExport() {
       this.$message({
         message: '数据导出中，请勿重复操作！',
         type: 'success'
       })
       try {
         this.exportExcelLoading = true
-        const exportExcelParams = { ...this.formInline, templateType: this.exportTemplate }
-        !!this.selectOrderIds.length && (exportExcelParams.orderIds = this.selectOrderIds.map(item => item.orderId))
+        const exportExcelParams = { ...this.listQuery, templateType: this.exportTemplate }
+        !!this.selectOrderIds.length && (exportExcelParams.orderIds = this.selectOrderIds.map((item) => item.orderId))
         const res = await orderExport(exportExcelParams)
         if (!res) {
           return
         }
-        const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+        const blob = new Blob([ res ], { type: 'application/vnd.ms-excel' })
         const fileName = '订单数据明细表.xls'
         if ('download' in document.createElement('a')) {
           // 非IE下载
@@ -292,11 +279,31 @@ export default {
 }
 </script>
 
-<style lang='scss' scoped>
-//@import url(); 引入公共css类
-@import url("../../../styles/elDialog.scss");
+<style lang="scss" scoped>
+.app-container {
+	padding: 20px;
+	display: flex;
+	flex-direction: column;
+
+	.filter-container {
+		.filter-item {
+			display: inline-block;
+			vertical-align: middle;
+			margin-bottom: 10px;
+		}
+	}
+
+	.small-padding {
+		.cell {
+			padding-left: 5px;
+			padding-right: 5px;
+		}
+	}
 
-.tab_show {
-  padding-left: 30px;
+	.fixed-width {
+		.el-button--mini {
+			padding: 7px 10px;
+		}
+	}
 }
 </style>

src/views/relationshipChainManagement/commissionLog/components/DetailModal.vue

@@ -16,13 +16,18 @@
       <el-form-item label="ID" prop="commissionLogId">
         {{ formData.commissionLogId || '--' }}
       </el-form-item>
-      <el-form-item label="分佣类型" prop="commissionType">
-        <span v-if="formData.commissionType === 1">社区订单</span>
-        <span v-else-if="formData.commissionType === 2">商圈订单</span>
-        <span v-else-if="formData.commissionType === 3">商城订单</span>
-        <span v-else-if="formData.commissionType === 4">团长升级</span>
-        <span v-else-if="formData.commissionType === 5">充值赠送代金券</span>
-        <span v-else-if="formData.commissionType === 6">赠送佣金活动</span>
+      <el-form-item label="活动配置类型" prop="commissionType">
+        <span v-if="formData.commissionType === 1">升级活动</span>
+        <span v-else-if="formData.commissionType === 2">分佣活动</span>
+        <span v-else-if="formData.commissionType === 3">社区活动</span>
+        <span v-else-if="formData.commissionType === 4">赠券活动</span>
+        <span v-else-if="formData.commissionType === 5">赠金活动</span>
+        <span v-else-if="formData.commissionType === 6">商圈订单</span>
+        <span v-else-if="formData.commissionType === 7">爆品家具</span>
+        <span v-else-if="formData.commissionType === 8">社区订单</span>
+        <span v-else-if="formData.commissionType === 9">用户代金券转增</span>
+        <span v-else-if="formData.commissionType === 10">商家代金券转赠</span>
+        <span v-else-if="formData.commissionType === 11">同城联盟卡</span>
         <span v-else>--</span>
       </el-form-item>
       <el-form-item label="交易时间" prop="tradeTime">
@@ -41,16 +46,23 @@
         {{ formData.orderPrice || '--' }}
       </el-form-item>
       <el-form-item label="佣金比例/金额" prop="orderProportion">
-        {{ formData.orderProportion || '--' }}
+        <span v-if="formData.orderProportion <= 1">{{ formData.orderProportion * 100 }}%</span>
+        <span v-else-if="formData.orderProportion > 1">￥{{ formData.orderProportion }}</span>
       </el-form-item>
-      <el-form-item label="团长ID" prop="tId">
-        {{ formData.tId || '--' }}
+      <el-form-item label="上级身份" prop="tidentity">
+        {{ formData.tidentity || '--' }}
       </el-form-item>
-      <el-form-item label="团长手机号" prop="tPhone">
-        {{ formData.tPhone || '--' }}
+      <el-form-item label="上级ID" prop="tid">
+        {{ formData.tid || '--' }}
+      </el-form-item>
+      <el-form-item label="上级手机号" prop="tphone">
+        {{ formData.tphone || '--' }}
       </el-form-item>
       <el-form-item label="用于分佣的佣金总额" prop="commissionPrice">
-        {{ formData.commissionPrice || '--' }}
+        ￥{{ typeof formData.commissionPrice === 'number' ? formData.commissionPrice : '--' }}
+      </el-form-item>
+      <el-form-item label="获得佣金" prop="userCommission">
+        ￥{{ typeof formData.userCommission === 'number' ? formData.userCommission : '--' }}
       </el-form-item>
       <el-form-item label="佣金分配详情" prop="commissionDetail">
         {{ formData.commissionDetail || '--' }}
@@ -80,9 +92,11 @@ export default {
         phone: '',
         orderPrice: '',
         orderProportion: '',
-        tId: '',
-        tPhone: '',
+        tidentity: '',
+        tid: '',
+        tphone: '',
         commissionPrice: '',
+        userCommission: '',
         commissionDetail: ''
       }
     }

src/views/relationshipChainManagement/commissionLog/index.vue

@@ -28,12 +28,17 @@
         <el-table-column align="center" width="100" label="ID" prop="commissionLogId" fixed="left" />
         <el-table-column align="center" label="分佣类型" prop="commissionType">
           <template slot-scope="{ row }">
-            <el-tag v-if="row.commissionType === 1" effect="plain">社区订单</el-tag>
-            <el-tag v-else-if="row.commissionType === 2" effect="plain">商圈订单</el-tag>
-            <el-tag v-else-if="row.commissionType === 3" effect="plain">商城订单</el-tag>
-            <el-tag v-else-if="row.commissionType === 4" effect="plain">团长升级</el-tag>
-            <el-tag v-else-if="row.commissionType === 5" effect="plain">充值赠送代金券</el-tag>
-            <el-tag v-else-if="row.commissionType === 6" effect="plain">赠送佣金活动</el-tag>
+            <el-tag v-if="row.commissionType === 1" effect="plain">升级活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 2" effect="plain">分佣活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 3" effect="plain">社区活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 4" effect="plain">赠券活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 5" effect="plain">赠金活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 6" effect="plain">商圈订单</el-tag>
+            <el-tag v-else-if="row.commissionType === 7" effect="plain">爆品家具</el-tag>
+            <el-tag v-else-if="row.commissionType === 8" effect="plain">社区订单</el-tag>
+            <el-tag v-else-if="row.commissionType === 9" effect="plain">用户代金券转增</el-tag>
+            <el-tag v-else-if="row.commissionType === 10" effect="plain">商家代金券转赠</el-tag>
+            <el-tag v-else-if="row.commissionType === 11" effect="plain">同城联盟卡</el-tag>
             <span v-else>--</span>
           </template>
         </el-table-column>
@@ -42,12 +47,19 @@
         <el-table-column align="center" width="100" label="购买用户ID" prop="buyerUserId" show-overflow-tooltip />
         <el-table-column align="center" width="150" label="下单用户号码" prop="phone" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="支付金额" prop="orderPrice" show-overflow-tooltip />
-        <el-table-column align="center" width="100" label="佣金比例/金额" prop="orderProportion" show-overflow-tooltip />
-        <el-table-column align="center" width="100" label="团长ID" prop="tId" show-overflow-tooltip />
-        <el-table-column align="center" width="120" label="团长手机号" prop="tPhone" show-overflow-tooltip />
+        <el-table-column align="center" width="120" prop="orderProportion" label="佣金比例/金额">
+          <template slot-scope="{ row }">
+            <span v-if="row.orderProportion <= 1">{{ row.orderProportion * 100 }}%</span>
+            <span v-else-if="row.orderProportion > 1">￥{{ row.orderProportion }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" width="120" label="上级身份" prop="tidentity" show-overflow-tooltip />
+        <el-table-column align="center" width="100" label="上级ID" prop="tid" show-overflow-tooltip />
+        <el-table-column align="center" width="120" label="上级手机号" prop="tphone" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="用于分佣的佣金总额" prop="commissionPrice" show-overflow-tooltip />
+        <el-table-column align="center" width="100" label="获得佣金" prop="userCommission" show-overflow-tooltip />
         <!-- <el-table-column align="center" width="100" label="佣金分配详情" prop="commissionDetail" show-overflow-tooltip /> -->
-        <el-table-column align="center" label="操作" width="220" fixed="right" class-name="small-padding fixed-width">
+        <el-table-column align="center" label="操作" width="120" fixed="right" class-name="small-padding fixed-width">
           <template slot-scope="{ row }">
             <el-button type="warning" size="mini" @click="handleDetail(row)">
               详情

src/views/relationshipChainManagement/upgradeLog/index.vue

@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column align="center" min-width="150" label="操作详情" prop="operateDetail" show-overflow-tooltip />
         <el-table-column align="center" width="150" label="操作时间" prop="operateTime" />
-        <el-table-column align="center" label="操作" width="220" fixed="right" class-name="small-padding fixed-width">
+        <el-table-column align="center" label="操作" width="120" fixed="right" class-name="small-padding fixed-width">
           <template slot-scope="{ row }">
             <el-button type="warning" size="mini" @click="handleDetail(row)">
               详情

src/views/setup/phone/index.vue

@@ -13,11 +13,11 @@
           <el-input v-model="ruleForm.newPhone" maxlength="11" style="width: 70%" placeholder="请输入新手机号" />
         </el-form-item>
         <el-form-item label="验证码" prop="code">
-          <el-input v-model="ruleForm.code" maxlength="6" style="width: 40%; margin-right: 38px" placeholder="请输入验证码" />
-          <el-button class="codeBtn" type="primary" :loading="codeloading" @click="getCode(oldPhone)">
-            <span v-if="!codeloading">获取验证码</span>
-            <span v-else>{{ count }} s</span>
-          </el-button>
+          <GraphicVerificationCode
+            api-type="update"
+            :phone="ruleForm.newPhone"
+            @input="(e) => ruleForm.code = e"
+          ></GraphicVerificationCode>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submint"> 确定 </el-button>
@@ -28,14 +28,16 @@
 </template>
 
 <script>
+import GraphicVerificationCode from '@/components/GraphicVerificationCode/index.vue'
 import {
   getAdminPhone,
-  getUpdatePhoneCode,
   updatePhone
 } from '@/api/privacy'
 const JM = require('@/utils/rsaEncrypt.js')
-const TIME_COUNT = 120 // 更改倒计时时间
 export default {
+  components: {
+    GraphicVerificationCode
+  },
   data() {
     // 旧手机号
     const oldPhone = (rule, value, callback) => {
@@ -73,9 +75,6 @@ export default {
         newPhone: [ { required: true, validator: newPhone, trigger: 'blur' } ],
         code: [ { required: true, validator: code, trigger: 'blur' } ]
       },
-      codeloading: false,
-      count: '',
-      timer: null,
       privacyTime: 0
     }
   },
@@ -91,40 +90,6 @@ export default {
         this.oldPhone = res.data
       })
     },
-    // 获取验证码
-    async getCode(phone) {
-      console.log(phone)
-      if (phone === '' || phone === undefined) {
-        this.$message.error('请填写新手机号')
-        return
-      }
-      if (/^1[3456789]\d{9}$/.test(phone) === false) {
-        this.$message.error('请填写正确手机号')
-        return false
-      }
-      if (!this.timer) {
-        this.codeloading = true
-        this.count = TIME_COUNT
-        this.show = false
-        const res = await getUpdatePhoneCode({ phone })
-        if (res.code === '') {
-          this.$message({
-            message: '发送成功，请注意查看手机短信',
-            type: 'success'
-          })
-        }
-        this.timer = setInterval(() => {
-          if (this.count > 0 && this.count <= TIME_COUNT) {
-            this.count--
-          } else {
-            this.show = true
-            clearInterval(this.timer) // 清除定时器
-            this.timer = null
-            this.codeloading = false
-          }
-        }, 1000)
-      }
-    },
     submint() {
       if (this.ruleForm.newPhone === '' || this.ruleForm.newPhone === undefined) {
         this.$message.error('请填写新手机号')

src/views/setup/privacy/index.vue

@@ -13,11 +13,11 @@
           <el-input v-else v-model="ruleForm.newPhone" disabled style="width: 70%" placeholder="请输入管理员电话" />
         </el-form-item>
         <el-form-item label="验证码" prop="code">
-          <el-input v-model="ruleForm.code" maxlength="6" style="width: 40%; margin-right: 38px" placeholder="请输入验证码" />
-          <el-button class="codeBtn" type="primary" :loading="codeloading" @click="getCode(ruleForm.newPhone)">
-            <span v-if="!codeloading">获取验证码</span>
-            <span v-else>{{ count }} s</span>
-          </el-button>
+          <GraphicVerificationCode
+            api-type="update"
+            :phone="ruleForm.newPhone"
+            @input="(e) => ruleForm.code = e"
+          ></GraphicVerificationCode>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submint(ruleForm.newPhone)">
@@ -30,14 +30,16 @@
 </template>
 
 <script>
+import GraphicVerificationCode from '@/components/GraphicVerificationCode/index.vue'
 import {
   getAdminPhone,
-  getPrivacyCode,
   verifyPrivacyCode
 } from '@/api/privacy'
-const TIME_COUNT = 120 // 更改倒计时时间
 const JM = require('@/utils/rsaEncrypt.js')
 export default {
+  components: {
+    GraphicVerificationCode
+  },
   data() {
     // 管理员手机号码
     const newPhone = (rule, value, callback) => {
@@ -65,9 +67,6 @@ export default {
         newPhone: [ { required: true, validator: newPhone, trigger: 'blur' } ],
         code: [ { required: true, validator: code, trigger: 'blur' } ]
       },
-      codeloading: false,
-      count: '',
-      timer: null,
       privacyTime: 0,
       now_time: ''
     }
@@ -99,44 +98,8 @@ export default {
         // this.newPhone = res.data.substr(0, 3) + "****" + res.data.substr(7);
       })
     },
-    // 获取验证码
-    async getCode(phone) {
-      console.log(phone)
-      if (phone === '' || phone === undefined) {
-        this.$message.error('请填写手机号')
-        return
-      }
-      if (/^1[3456789]\d{9}$/.test(phone) === false) {
-        this.$message.error('请填写正确手机号')
-        return false
-      }
-      if (!this.timer) {
-        this.codeloading = true
-        this.count = TIME_COUNT
-        this.show = false
-        const res = await getPrivacyCode({ phone })
-        if (res.code === '') {
-          this.$message({
-            message: '发送成功，请注意查看手机短信',
-            type: 'success'
-          })
-        }
-        this.timer = setInterval(() => {
-          if (this.count > 0 && this.count <= TIME_COUNT) {
-            this.count--
-          } else {
-            this.show = true
-            clearInterval(this.timer) // 清除定时器
-            this.timer = null
-            this.codeloading = false
-          }
-        }, 1000)
-      }
-    },
     // 确定
     async submint() {
-      this.timer = null
-      this.codeloading = false
       if (this.ruleForm.code === '' || this.ruleForm.code === undefined) {
         this.$message.error('请填写验证码')
         return

src/views/signInManagement/transactionSignIn/components/DetailModal.vue

@@ -0,0 +1,80 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    v-bind="modalOptions"
+  >
+    <el-form
+      ref="formData"
+      :model="formData"
+      size="mini"
+      label-position="left"
+      label-suffix=":"
+      label-width="200px"
+    >
+      <!-- 消费金签到配置信息 -->
+      <el-form-item label="ID" prop="signConfigId">
+        {{ formData.signConfigId || '--' }}
+      </el-form-item>
+      <el-form-item label="每日签到金额" prop="signPrice">
+        {{ formData.signPrice || '--' }}
+      </el-form-item>
+      <el-form-item label="连续签到天数设置" prop="signDay">
+        {{ formData.signDay || '--' }}
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        {{ formData.createTime || '--' }}
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+import { getByIdBeeSignConfig } from '@/api/signInManagement/transactionSignIn'
+
+export default {
+  name: 'DetailModal',
+  data() {
+    return {
+      modalOptions: {
+        closeOnClickModal: false,
+        width: '800px',
+        title: '查看消费金签到配置详情'
+      },
+      visible: false,
+      formData: {
+        signConfigId: '',
+        signPrice: '',
+        signDay: '',
+        createTime: ''
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.visible = false
+    },
+    handleOpen(params = {}) {
+      this.formData = Object.assign(this.$options.data().formData, params)
+      if (params.signConfigId) {
+        this.getInfo(params.signConfigId)
+      }
+      this.visible = true
+    },
+    async getInfo(id) {
+      const loading = this.$loading({ text: '加载中' })
+      try {
+        const res = await getByIdBeeSignConfig({ id })
+        this.formData = Object.assign(this.$options.data().formData, res.data, {
+          signConfigId: res.data.signConfigId || '',
+          signPrice: res.data.signPrice || '',
+          signDay: res.data.signDay || '',
+          createTime: res.data.createTime || ''
+        })
+      } finally {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+

src/views/signInManagement/transactionSignIn/components/EditModal.vue

@@ -0,0 +1,133 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    v-bind="modalOptions"
+  >
+    <el-form
+      ref="formData"
+      :model="formData"
+      :rules="formRules"
+      size="mini"
+      label-suffix=":"
+      label-width="150px"
+    >
+      <el-form-item label="每日签到金额" prop="signPrice">
+        <el-input v-model="formData.signPrice" placeholder="请输入每日签到金额" style="width: 200px;">
+          <template #append>
+            <div>元</div>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="连续签到天数" prop="signDay">
+        <el-input v-model="formData.signDay" placeholder="请输入连续签到天数" style="width: 200px;">
+          <template #append>
+            <div>天</div>
+          </template>
+        </el-input>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button size="mini" @click="handleClose">取 消</el-button>
+        <el-button type="primary" size="mini" @click="handleSubmit">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { saveBeeSignConfig, updateBeeSignConfig, getByIdBeeSignConfig } from '@/api/signInManagement/transactionSignIn'
+
+export default {
+  name: 'EditModal',
+  components: {
+  },
+  data() {
+    return {
+      modalOptions: {
+        closeOnClickModal: false,
+        width: '820px',
+        title: ''
+      },
+      visible: false,
+      formData: {
+        signConfigId: '',
+        signPrice: '',
+        signDay: '',
+        createTime: ''
+      },
+      formRules: {
+        signPrice: [
+          { required: true, message: '请输入每日签到金额' },
+          { pattern: /^0\.\d{0,2}$|^[1-9]\d*\.\d{0,2}$|^[1-9]\d*$/, message: '数值有误' }
+        ],
+        signDay: [
+          { required: true, message: '请输入连续签到天数' },
+          { pattern: /^(0|[1-9][0-9]*)$/, message: '请输入正整数' }
+        ]
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.visible = false
+    },
+    initList() {
+    },
+    handleOpen(params = {}) {
+      this.modalOptions.title = params.signConfigId ? '编辑消费金签到配置' : '添加消费金签到配置'
+      this.formData = Object.assign(this.$options.data().formData, params)
+      this.visible = true
+      this.initList()
+      if (params.signConfigId) {
+        this.getInfo(params.signConfigId)
+      } else {
+        this.$refs.formData && this.$refs.formData.resetFields()
+      }
+    },
+    async getInfo(id) {
+      const loading = this.$loading({ text: '加载中' })
+      try {
+        const res = await getByIdBeeSignConfig({ id })
+        this.formData = Object.assign(this.$options.data().formData, res.data, {
+          signConfigId: res.data.signConfigId || '',
+          signPrice: res.data.signPrice || '',
+          signDay: res.data.signDay || '',
+          createTime: res.data.createTime || ''
+        })
+        this.$nextTick(() => {
+          this.$refs.formData && this.$refs.formData.validate()
+        })
+      } finally {
+        loading.close()
+      }
+    },
+    handleSubmit() {
+      this.$refs.formData.validate(async (valid) => {
+        if (valid) {
+          const loading = this.$loading({ text: '加载中' })
+          try {
+            const { ...otps } = this.formData
+            const params = {
+              ...otps
+            }
+            this.formData.signConfigId ? await updateBeeSignConfig(params) : await saveBeeSignConfig(params)
+            loading.close()
+            this.$message({ message: `${this.formData.signConfigId ? '编辑' : '添加'}成功!`, type: 'success' })
+            this.$emit('success')
+            this.visible = false
+          } catch (e) {
+            loading.close()
+          } finally {
+            loading.close()
+          }
+        } else {
+          this.$message({ message: '请输入相关信息', type: 'warning' })
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+

src/views/signInManagement/transactionSignIn/index.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="app-container">
+    <!-- 查询和其他操作 -->
+    <div class="filter-container">
+      <el-button
+        size="mini" class="filter-item" type="primary" icon="el-icon-search"
+        style="margin-left:10px;"
+        @click="handleSearch"
+      >
+        查找
+      </el-button>
+      <br />
+      <el-button
+        size="mini" type="primary" icon="el-icon-plus"
+        @click="$refs.EditModal && $refs.EditModal.handleOpen({ signConfigId: '' })"
+      >
+        添加
+      </el-button>
+    </div>
+
+    <!-- 查询结果 -->
+    <div v-tableHeight>
+      <el-table
+        v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list"
+        v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
+      >
+        <el-table-column align="center" width="100" label="ID" prop="signConfigId" fixed="left" />
+        <el-table-column align="center" width="150" label="每日签到金额" prop="signPrice" fixed="left" show-overflow-tooltip />
+        <el-table-column align="center" width="150" label="连续签到天数设置" prop="signDay" show-overflow-tooltip />
+        <el-table-column align="center" width="150" label="创建时间" prop="createTime" />
+        <el-table-column align="center" label="操作" width="300" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="{ row }">
+            <el-button size="mini" @click="handleDetail(row)">
+              查看
+            </el-button>
+            <el-button size="mini" @click="handleEdit(row)">
+              编辑
+            </el-button>
+            <el-button type="danger" size="mini" @click="handleDelete(row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div>
+      <el-pagination
+        :current-page="listQuery.page" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"
+        @size-change="(val) => ((listQuery.pageSize = val) && getList())"
+        @current-change="(val) => ((listQuery.page = val) && getList())"
+      />
+    </div>
+
+    <!-- 新增编辑 -->
+    <EditModal ref="EditModal" @success="getList" />
+    <!-- 查看详情 -->
+    <DetailModal ref="DetailModal" />
+  </div>
+</template>
+
+<script>
+import EditModal from './components/EditModal'
+import DetailModal from './components/DetailModal'
+import { getAllBeeSignConfig, deleteByIdBeeSignConfig } from '@/api/signInManagement/transactionSignIn'
+
+export default {
+  name: 'TransactionSignIn',
+  components: {
+    EditModal,
+    DetailModal
+  },
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        pageSize: 20
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      this.listLoading = true
+      try {
+        const res = await getAllBeeSignConfig(this.listQuery)
+        this.list = res.data.items
+        this.total = res.data.total
+      } finally {
+        this.listLoading = false
+      }
+    },
+    handleSearch() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    handleDetail(row) {
+      this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
+    },
+    handleEdit(row) {
+      this.$refs.EditModal && this.$refs.EditModal.handleOpen(row)
+    },
+    handleDelete(row) {
+      this.$confirm('确定删除此项？')
+        .then(async () => {
+          await deleteByIdBeeSignConfig({ id: row.signConfigId })
+          this.$message({ message: '删除成功！', type: 'success' })
+          this.handleSearch()
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.app-container {
+	padding: 20px;
+	display: flex;
+	flex-direction: column;
+
+	.filter-container {
+		.filter-item {
+			display: inline-block;
+			vertical-align: middle;
+			margin-bottom: 10px;
+		}
+	}
+
+	.small-padding {
+		.cell {
+			padding-left: 5px;
+			padding-right: 5px;
+		}
+	}
+
+	.fixed-width {
+		.el-button--mini {
+			padding: 7px 10px;
+		}
+	}
+}
+</style>

src/views/signInManagement/voucherSignIn/components/DetailModal.vue

@@ -0,0 +1,80 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    v-bind="modalOptions"
+  >
+    <el-form
+      ref="formData"
+      :model="formData"
+      size="mini"
+      label-position="left"
+      label-suffix=":"
+      label-width="200px"
+    >
+      <!-- 消费金签到配置信息 -->
+      <el-form-item label="ID" prop="signConfigId">
+        {{ formData.signConfigId || '--' }}
+      </el-form-item>
+      <el-form-item label="每日签到金额" prop="signPrice">
+        {{ formData.signPrice || '--' }}
+      </el-form-item>
+      <el-form-item label="连续签到天数设置" prop="signDay">
+        {{ formData.signDay || '--' }}
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        {{ formData.createTime || '--' }}
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+import { getByIdVoucherSignConfig } from '@/api/signInManagement/voucherSignIn'
+
+export default {
+  name: 'DetailModal',
+  data() {
+    return {
+      modalOptions: {
+        closeOnClickModal: false,
+        width: '800px',
+        title: '查看消费金签到配置详情'
+      },
+      visible: false,
+      formData: {
+        signConfigId: '',
+        signPrice: '',
+        signDay: '',
+        createTime: ''
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.visible = false
+    },
+    handleOpen(params = {}) {
+      this.formData = Object.assign(this.$options.data().formData, params)
+      if (params.signConfigId) {
+        this.getInfo(params.signConfigId)
+      }
+      this.visible = true
+    },
+    async getInfo(id) {
+      const loading = this.$loading({ text: '加载中' })
+      try {
+        const res = await getByIdVoucherSignConfig({ id })
+        this.formData = Object.assign(this.$options.data().formData, res.data, {
+          signConfigId: res.data.signConfigId || '',
+          signPrice: res.data.signPrice || '',
+          signDay: res.data.signDay || '',
+          createTime: res.data.createTime || ''
+        })
+      } finally {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+

src/views/signInManagement/voucherSignIn/components/EditModal.vue

@@ -0,0 +1,133 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    v-bind="modalOptions"
+  >
+    <el-form
+      ref="formData"
+      :model="formData"
+      :rules="formRules"
+      size="mini"
+      label-suffix=":"
+      label-width="150px"
+    >
+      <el-form-item label="每日签到金额" prop="signPrice">
+        <el-input v-model="formData.signPrice" placeholder="请输入每日签到金额" style="width: 200px;">
+          <template #append>
+            <div>元</div>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="连续签到天数" prop="signDay">
+        <el-input v-model="formData.signDay" placeholder="请输入连续签到天数" style="width: 200px;">
+          <template #append>
+            <div>天</div>
+          </template>
+        </el-input>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button size="mini" @click="handleClose">取 消</el-button>
+        <el-button type="primary" size="mini" @click="handleSubmit">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { saveVoucherSignConfig, updateVoucherSignConfig, getByIdVoucherSignConfig } from '@/api/signInManagement/voucherSignIn'
+
+export default {
+  name: 'EditModal',
+  components: {
+  },
+  data() {
+    return {
+      modalOptions: {
+        closeOnClickModal: false,
+        width: '820px',
+        title: ''
+      },
+      visible: false,
+      formData: {
+        signConfigId: '',
+        signPrice: '',
+        signDay: '',
+        createTime: ''
+      },
+      formRules: {
+        signPrice: [
+          { required: true, message: '请输入每日签到金额' },
+          { pattern: /^0\.\d{0,2}$|^[1-9]\d*\.\d{0,2}$|^[1-9]\d*$/, message: '数值有误' }
+        ],
+        signDay: [
+          { required: true, message: '请输入连续签到天数' },
+          { pattern: /^(0|[1-9][0-9]*)$/, message: '请输入正整数' }
+        ]
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.visible = false
+    },
+    initList() {
+    },
+    handleOpen(params = {}) {
+      this.modalOptions.title = params.signConfigId ? '编辑消费金签到配置' : '添加消费金签到配置'
+      this.formData = Object.assign(this.$options.data().formData, params)
+      this.visible = true
+      this.initList()
+      if (params.signConfigId) {
+        this.getInfo(params.signConfigId)
+      } else {
+        this.$refs.formData && this.$refs.formData.resetFields()
+      }
+    },
+    async getInfo(id) {
+      const loading = this.$loading({ text: '加载中' })
+      try {
+        const res = await getByIdVoucherSignConfig({ id })
+        this.formData = Object.assign(this.$options.data().formData, res.data, {
+          signConfigId: res.data.signConfigId || '',
+          signPrice: res.data.signPrice || '',
+          signDay: res.data.signDay || '',
+          createTime: res.data.createTime || ''
+        })
+        this.$nextTick(() => {
+          this.$refs.formData && this.$refs.formData.validate()
+        })
+      } finally {
+        loading.close()
+      }
+    },
+    handleSubmit() {
+      this.$refs.formData.validate(async (valid) => {
+        if (valid) {
+          const loading = this.$loading({ text: '加载中' })
+          try {
+            const { ...otps } = this.formData
+            const params = {
+              ...otps
+            }
+            this.formData.signConfigId ? await updateVoucherSignConfig(params) : await saveVoucherSignConfig(params)
+            loading.close()
+            this.$message({ message: `${this.formData.signConfigId ? '编辑' : '添加'}成功!`, type: 'success' })
+            this.$emit('success')
+            this.visible = false
+          } catch (e) {
+            loading.close()
+          } finally {
+            loading.close()
+          }
+        } else {
+          this.$message({ message: '请输入相关信息', type: 'warning' })
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+

src/views/signInManagement/voucherSignIn/index.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="app-container">
+    <!-- 查询和其他操作 -->
+    <div class="filter-container">
+      <el-button
+        size="mini" class="filter-item" type="primary" icon="el-icon-search"
+        style="margin-left:10px;"
+        @click="handleSearch"
+      >
+        查找
+      </el-button>
+      <br />
+      <el-button
+        size="mini" type="primary" icon="el-icon-plus"
+        @click="$refs.EditModal && $refs.EditModal.handleOpen({ signConfigId: '' })"
+      >
+        添加
+      </el-button>
+    </div>
+
+    <!-- 查询结果 -->
+    <div v-tableHeight>
+      <el-table
+        v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list"
+        v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
+      >
+        <el-table-column align="center" width="100" label="ID" prop="signConfigId" fixed="left" />
+        <el-table-column align="center" width="150" label="每日签到金额" prop="signPrice" fixed="left" show-overflow-tooltip />
+        <el-table-column align="center" width="150" label="连续签到天数设置" prop="signDay" show-overflow-tooltip />
+        <el-table-column align="center" width="150" label="创建时间" prop="createTime" />
+        <el-table-column align="center" label="操作" width="300" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="{ row }">
+            <el-button size="mini" @click="handleDetail(row)">
+              查看
+            </el-button>
+            <el-button size="mini" @click="handleEdit(row)">
+              编辑
+            </el-button>
+            <el-button type="danger" size="mini" @click="handleDelete(row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div>
+      <el-pagination
+        :current-page="listQuery.page" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"
+        @size-change="(val) => ((listQuery.pageSize = val) && getList())"
+        @current-change="(val) => ((listQuery.page = val) && getList())"
+      />
+    </div>
+
+    <!-- 新增编辑 -->
+    <EditModal ref="EditModal" @success="getList" />
+    <!-- 查看详情 -->
+    <DetailModal ref="DetailModal" />
+  </div>
+</template>
+
+<script>
+import EditModal from './components/EditModal'
+import DetailModal from './components/DetailModal'
+import { getAllVoucherSignConfig, deleteByIdVoucherSignConfig } from '@/api/signInManagement/voucherSignIn'
+
+export default {
+  name: 'VoucherSignIn',
+  components: {
+    EditModal,
+    DetailModal
+  },
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        pageSize: 20
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      this.listLoading = true
+      try {
+        const res = await getAllVoucherSignConfig(this.listQuery)
+        this.list = res.data.items
+        this.total = res.data.total
+      } finally {
+        this.listLoading = false
+      }
+    },
+    handleSearch() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    handleDetail(row) {
+      this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
+    },
+    handleEdit(row) {
+      this.$refs.EditModal && this.$refs.EditModal.handleOpen(row)
+    },
+    handleDelete(row) {
+      this.$confirm('确定删除此项？')
+        .then(async () => {
+          await deleteByIdVoucherSignConfig({ id: row.signConfigId })
+          this.$message({ message: '删除成功！', type: 'success' })
+          this.handleSearch()
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.app-container {
+	padding: 20px;
+	display: flex;
+	flex-direction: column;
+
+	.filter-container {
+		.filter-item {
+			display: inline-block;
+			vertical-align: middle;
+			margin-bottom: 10px;
+		}
+	}
+
+	.small-padding {
+		.cell {
+			padding-left: 5px;
+			padding-right: 5px;
+		}
+	}
+
+	.fixed-width {
+		.el-button--mini {
+			padding: 7px 10px;
+		}
+	}
+}
+</style>

vue.config.js

@@ -50,7 +50,7 @@ module.exports = {
         }
       },
       '/tuan': {
-        target: 'https://test.tuanfengkeji.cn:9527/dts-app-api', // 测试
+        target: 'https://test.tuanfengkeji.cn/dts-app-api', // 测试
         changeOrigin: true,
         pathRewrite: {
           '^/tuan': ''