Merge remote-tracking branch 'origin/master'

pages.json

@@ -168,6 +168,25 @@
                 "enablePullDownRefresh": false
             }
         }
+        ,{
+            "path" : "pages/mine/authPerson",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,
+        {
+            "path" : "pages/mine/authFirm",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/mine/addBankCard.vue

@@ -4,7 +4,6 @@
     <navbar leftClick @leftClick="$utils.navigateBack" title="添加银行卡"/>
 
     <!--添加银行卡页面-->
-
     <view class="container">
       <view class="header">
         <text>为保证您的资金安全，请绑定账户本人的银行卡</text>

pages/mine/authFirm.vue

@@ -0,0 +1,173 @@
+<template>
+  <view class="auth-firm">
+    <!--顶部导航栏-->
+    <navbar leftClick @leftClick="$utils.navigateBack" title="认证企业"/>
+
+    <!--身份信息页面-->
+    <view class="container">
+      <view class="form-item">
+        <view class="label">法人真实姓名</view>
+        <view class="input">{{ name }}</view>
+      </view>
+
+      <uv-divider :hairline="false" lineColor="#c0c0c0" dot></uv-divider>
+
+      <view class="form-item">
+        <view class="label">法人身份证号</view>
+        <view class="input">{{ idCard }}</view>
+      </view>
+
+      <uv-divider :hairline="false" lineColor="#c0c0c0" dot></uv-divider>
+
+      <view class="form-item">
+        <view class="label">营业执照</view>
+        <view class="upload">
+          <uv-upload
+              :fileList="yxzzFileList"
+              :maxCount="5"
+              multiple
+              width="150rpx"
+              height="150rpx"
+              @delete="yxzzDeleteImage"
+              @afterRead="yxzzAfterRead"
+              :previewFullImage="true"></uv-upload>
+        </view>
+      </view>
+
+      <uv-divider :hairline="false" lineColor="#c0c0c0" dot></uv-divider>
+
+      <view class="form-item">
+        <view class="label">其他资质</view>
+        <view class="upload">
+          <uv-upload
+              :fileList="qtzzFileList"
+              :maxCount="5"
+              multiple
+              width="150rpx"
+              height="150rpx"
+              @delete="qtzzDeleteImage"
+              @afterRead="qtzzAfterRead"
+              :previewFullImage="true"></uv-upload>
+        </view>
+      </view>
+
+    </view>
+
+
+
+    <!--请仔细阅读平台《用户协议》《隐私协议》-->
+    <view class="agree">
+      <view>
+        请仔细阅读平台<span style="color:#009dff">《用户协议》</span><span style="color:#009dff">《隐私协议》</span>
+      </view>
+    </view>
+
+
+    <!--下一步按钮-->
+    <button @click="onNextClick" class="bottomBtn">
+      立即认证
+    </button>
+  </view>
+</template>
+
+<script>
+import '../../common.css'; // 引入公共 CSS 文件
+
+export default {
+  data() {
+    return {
+      name: 'xiaohua',
+      idCard: '2101472154874512',
+      yxzzFileList: [
+          {url: 'https://cdn.uviewui.com/uview/swiper/2.jpg'},
+      ],
+      qtzzFileList: [
+        {url: 'https://cdn.uviewui.com/uview/swiper/2.jpg'},
+      ],
+    }
+  },
+  methods: {
+    onNextClick() {
+      this.$utils.navigateTo("/mine/purse");
+    },
+    yxzzDeleteImage(e){
+      this.yxzzFileList.splice(e.index, 1)
+    },
+    qtzzDeleteImage(e){
+      this.qtzzFileList.splice(e.index, 1)
+    },
+
+    yxzzAfterRead(e){
+      let self = this
+      e.file.forEach(file => {
+        self.$Oss.ossUpload(file.url).then(url => {
+          self.yxzzFileList.push({
+            url
+          })
+        })
+      })
+    },
+    qtzzAfterRead(e){
+      let self = this
+      e.file.forEach(file => {
+        self.$Oss.ossUpload(file.url).then(url => {
+          self.qtzzFileList.push({
+            url
+          })
+        })
+      })
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+.auth-firm {
+  .container {
+    padding: 100rpx 50rpx 50rpx 50rpx;
+    //border: 1px solid red;
+
+    .header {
+      margin-bottom: 40rpx;
+      font-size: 28rpx;
+      color: #666;
+    }
+
+    .form-item {
+      margin-bottom: 40rpx;
+
+      .label {
+        font-size: 36rpx;
+        margin-bottom: 10px;
+        display: block;
+      }
+
+      .input {
+        width: 100vw;
+        font-size: 38rpx;
+        margin-top: 40rpx;
+      }
+
+      .upload {
+
+      }
+    }
+  }
+
+  .agree {
+    display: flex;
+    justify-content: center;
+    position: fixed;
+    bottom: 12%;
+    width: 100vw;
+  }
+
+}
+
+</style>

pages/mine/authOption.vue

@@ -30,13 +30,13 @@ export default {
   },
   methods: {
     personAuth() {
-      this.$utils.navigateTo('/mine/certifiedIndividual')
+      this.$utils.navigateTo('/mine/certifiedIndividual?type=person')
     },
     firmAuth() {
-      this.$utils.navigateTo('/mine/enterpriseCertification')
+      this.$utils.navigateTo('/mine/certifiedIndividual?type=firm')
     },
+  },
 
-  }
 }
 </script>
 

pages/mine/authPerson.vue

@@ -0,0 +1,88 @@
+<template>
+  <view class="auth-person">
+    <!--顶部导航栏-->
+    <navbar leftClick @leftClick="$utils.navigateBack" title="认证个人"/>
+
+    <!--身份信息页面-->
+    <view class="container">
+      <view class="form-item">
+        <view class="label">姓名</view>
+        <view class="input">{{ name }}</view>
+      </view>
+
+      <uv-divider :hairline="false" lineColor="#c0c0c0" dot></uv-divider>
+
+      <view class="form-item">
+        <view class="label">身份证号</view>
+        <view class="input">{{ idCard }}</view>
+      </view>
+
+      <uv-divider :hairline="false" lineColor="#c0c0c0" dot></uv-divider>
+    </view>
+
+    <!--下一步按钮-->
+    <button @click="onNextClick" class="bottomBtn">
+      立即认证
+    </button>
+  </view>
+</template>
+
+<script>
+import '../../common.css'; // 引入公共 CSS 文件
+
+export default {
+  data() {
+    return {
+      name: 'xiaohua',
+      idCard: '2101472154874512'
+    }
+  },
+  methods: {
+    onCameraClick() {
+      // 添加拍照或选择图片的逻辑
+    },
+    onNextClick() {
+      this.$utils.navigateTo("/mine/purse");
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+.auth-person {
+  .container {
+    padding: 100rpx 50rpx 50rpx 50rpx;
+    //border: 1px solid red;
+
+    .header {
+      margin-bottom: 40rpx;
+      font-size: 28rpx;
+      color: #666;
+    }
+
+    .form-item {
+      margin-bottom: 40rpx;
+
+      .label {
+        font-size: 36rpx;
+        margin-bottom: 10px;
+        display: block;
+      }
+
+      .input {
+        width: 100vw;
+        font-size: 38rpx;
+        margin-top: 40rpx;
+      }
+    }
+  }
+
+}
+
+</style>

pages/mine/certifiedIndividual.vue

@@ -22,12 +22,12 @@
       </view>
     </view>
 
-    <!--立即上传按钮-->
+    <!--立即认证按钮-->
     <view @click="nowAuth" class="bottomBtn">
       立即认证
     </view>
 
-    <!--立即上传按钮-->
+    <!--人脸识别服务协议-->
     <view class="agree">
       <uv-checkbox-group v-model="checkboxValue" placement="column" size="35"
                          activeColor="#008000" inactiveColor="#999999">
@@ -42,15 +42,27 @@
 
 <script>
 export default {
+  onLoad: function (options) {
+    console.log(options,"options")
+    // 获取传递过来的 id 参数
+    this.type = options.type;
+    console.log('this.type :', this.type);
+    // 进行后续处理...
+  },
   data() {
     return {
       checkboxValue: '香蕉',
-      labelValue: '' // 如果labelValue为空，则不会显示任何内容
+      labelValue: '', // 如果labelValue为空，则不会显示任何内容
+      type: '',
     };
   },
   methods: {
     nowAuth() {
-
+      if (this.type=="person"){
+        this.$utils.navigateTo('/mine/authPerson')
+      }else if (this.type=="firm"){
+        this.$utils.navigateTo('/mine/authFirm')
+      }
     }
   }
 }
@@ -104,7 +116,7 @@ export default {
     color: #FFFFFF;
     text-align: center;
 
-    border: 1px solid red;
+    //border: 1px solid red;
     background: $uni-linear-gradient-color;
     -webkit-background-clip: text; /*将设置的背景颜色限制在文字中*/
     -webkit-text-fill-color: transparent; /*给文字设置成透明*/
@@ -115,7 +127,7 @@ export default {
     bottom: 7%;
     display: flex;
     padding-left: 20rpx;
-    border: 1px solid red;
+    //border: 1px solid red;
   }
 }
 </style>