Merge branch '6-8jys-yz3.5jy' of http://124.156.157.155:8060/r/usdt_one_pc ...

dcc

2024-08-03 1613da5e0d5b13b20fc384da3595766efe8ffb24

Merge branch '6-8jys-yz3.5jy' of http://124.156.157.155:8060/r/usdt_one_pc into 6-8jys-yz3.5jy

 jysPc6.8.zip

Binary files differ

 src/components/commonTrade/kline.vue

@@ -1,8 +1,9 @@
<template>
  <div class="kline-page">
    <!-- :style="{ width: width != 0 ? width + 'px' : '' }" -->
    <div
      id="kline-BoxMain"
      :style="{ width: width != 0 ? width + 'px' : '' }"
      style="width: 100%;"
      :class="[
        isFullscreen ? 'kline-BoxMain-full' : '',
        isSpotGoods ? 'kline-BoxMain' : 'kline-BoxMain1',

 src/views/login/step2/idSet.vue

@@ -67,7 +67,7 @@
                            </el-upload>
                            <p>{{ $t("message.user.zhengjianfanmian") }}</p>
                          </div>
                          <div class="text-center">
                          <!-- <div class="text-center">
                            <el-upload class="avatar-uploader" :action="`${nowUrl}/wap/public/uploadimg!execute.action`"
                              :headers="uploadHeader" accept=".jpg,.jpeg,.png,.gif.JPG,.JPEG,.PNG,.GIF"
                              :show-file-list="false" :on-success="holdIdCardSuccess" :on-error="onErrorUpload"
@@ -78,7 +78,7 @@
                              </el-icon>
                            </el-upload>
                            <p>{{ $t("message.user.shouchizhengjianzhao") }}</p>
                          </div>
                          </div> -->
                        </div>
                        <!-- 拍摄示例 -->
                        <div class="label label_top">
@@ -184,7 +184,7 @@
      // const { path, httpUrl } = res.data;
      // this.twoImg = httpUrl;
      const path = res.data;
      this.twoImg = `${this.nowUrl}/wap/public/showimg!showImg.action?imagePath=${data}`;
      this.twoImg = `${this.nowUrl}/wap/public/showimg!showImg.action?imagePath=${path}`;
      this.idBackImg = path;
    },
    //手持身份证
@@ -192,7 +192,7 @@
      // const { path, httpUrl } = res.data;
      // this.threeImg = httpUrl;
      const path = res.data;
      this.threeImg = `${this.nowUrl}/wap/public/showimg!showImg.action?imagePath=${data}`;
      this.threeImg = `${this.nowUrl}/wap/public/showimg!showImg.action?imagePath=${path}`;
      this.handheldPhoto = path;
    },

@@ -235,7 +235,7 @@
        return;
      }

      if (!this.idFrontImg || !this.idBackImg || !this.handheldPhoto) {
      if (!this.idFrontImg || !this.idBackImg) {
        this.$message.warning(this.$t("message.user.shangchuan6"));
        return;
      }
@@ -246,7 +246,7 @@
        name: this.name,
        idimg_1: this.idFrontImg,
        idimg_2: this.idBackImg,
        idimg_3: this.handheldPhoto,
        // idimg_3: this.handheldPhoto,
      }).then((res) => {
        if (res.code == "0") {
          this.$message.success(this.$t("message.user.bangdingchenggong"));
@@ -284,7 +284,7 @@
/* 图片上传 */
.image_upload {
  display: flex;
  justify-content: space-between;
  /* justify-content: space-between; */
}

.avatar-uploader .el-upload:hover {

 src/views/my/components/identityAuthenty.vue

@@ -70,20 +70,20 @@
            </el-upload>
            <p>{{ $t("message.user.zhengjianfanmian") }}</p>
          </div>
          <div class="text-center">
          <!-- <div class="text-center">
            <el-upload class="avatar-uploader" :action="`${nowUrl}/wap/public/uploadimg!execute.action`"
              accept=".jpg,.jpeg,.png,.gif.JPG,.JPEG,.PNG,.GIF" :show-file-list="false" :on-success="holdIdCardSuccess"
              :on-error="onErrorUpload" :before-upload="beforeAvatarUpload" :disabled="identifyStatus == 1">
              :on-error="onErrorUpload" :before-upload="beforeAvatarUpload" :disabled="identifyStatus == 1"> -->
              <!-- v-if="
                  handheldPhoto || identifyStatus == 2 || identifyStatus == 3
                " -->
              <img v-if="threeImg" :src="threeImg" class="avatar" />
              <!-- <img v-if="threeImg" :src="threeImg" class="avatar" />
              <el-icon v-else class="avatar-uploader-icon">
                <Plus />
              </el-icon>
            </el-upload>
            <p>{{ $t("message.user.shouchizhengjianzhao") }}</p>
          </div>
          </div> -->
        </div>
        <!-- 操作按钮 -->
        <div class="bind_btn">
@@ -271,7 +271,7 @@
        return;
      }

      if (!this.oneImg || !this.twoImg || !this.threeImg) {
      if (!this.oneImg || !this.twoImg) {
        ElMessage.warning(this.$t("message.user.shangchuan6"));
        return;
      }
@@ -282,7 +282,7 @@
        name: this.name,
        idimg_1: this.idFrontImg,
        idimg_2: this.idBackImg,
        idimg_3: this.handheldPhoto,
        // idimg_3: this.handheldPhoto,
      }).then((res) => {
        if (res.code == "0") {
          // 出来一个弹窗，显示已经提交成功
@@ -314,7 +314,8 @@

.image_upload {
  display: flex;
  justify-content: space-between;
  /* justify-content: space-between; */
  justify-content: flex-start;
}

.avatar-uploader .el-upload:hover {

 src/views/my/components/manualReset.vue

@@ -231,7 +231,7 @@
      // const { path, httpUrl } = res.data;
      // this.twoImg = httpUrl;
      const path = res.data;
      this.twoImg = `${this.nowUrl}/wap/public/showimg!showImg.action?imagePath=${data}`;
      this.twoImg = `${this.nowUrl}/wap/public/showimg!showImg.action?imagePath=${path}`;
      this.idBackImg = path;
    },
    //手持身份证
@@ -239,7 +239,7 @@
      // const { path, httpUrl } = res.data;
      // this.threeImg = httpUrl;
      const path = res.data;
      this.threeImg = `${this.nowUrl}/wap/public/showimg!showImg.action?imagePath=${data}`;
      this.threeImg = `${this.nowUrl}/wap/public/showimg!showImg.action?imagePath=${path}`;
      this.handheldPhoto = path;
    },
    onErrorUpload() {