submit

# Conflicts:
#	App.vue
#	http/interface.js
#	pages/home/index.vue

App.vue

@@ -3,7 +3,7 @@ import tabBar from "./util/tabbar";
 
 export default {
   onLaunch: function() {
-    uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2eFFjQUttUW1ZUTFXV20zOXlCQUZ4byIsIk5pY2tOYW1lIjoi6K645pe76L22IiwiVGVsTnVtIjoiMTgyMDUwNTI2MjciLCJBdmF0YXIiOiIiLCJJRE51bSI6IjMyMDUwNDE5OTgwOTE2NDAzMyIsImV4cCI6MTY5NjA0MTE4MCwiaXNzIjoibWFsbCJ9.bNsyjyMDacBrBlmP556rznofYq11M9AkoDpeixolE4o')
+    // uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2eFFjQUttUW1ZUTFXV20zOXlCQUZ4byIsIk5pY2tOYW1lIjoiIiwiVGVsTnVtIjoiMTgyMDUwNTI2MjciLCJBdmF0YXIiOiIiLCJJRE51bSI6IiIsImV4cCI6MTY5NTQzNjEwMSwiaXNzIjoibWFsbCJ9.qYzFMtoOOBuawYDTl7iuwlTTz7Fakhr8657PjxWhQ8I')
     uni.hideTabBar();
     uni.setStorageSync("tabBar", tabBar);
   },
@@ -36,5 +36,4 @@ export default {
 .u-border-top {
   border: none !important;
 }
-
 </style>

http/api.js

@@ -1,3 +1,3 @@
 export default {
-  baseUrl: "http://192.168.88.175:9021",
+  baseUrl: "https://warehouse.szjixun.cn",
 };

http/index.js

@@ -1,6 +1,8 @@
 import login from "./login";
 import deposit from "./deposit";
+import mine from "./mine";
 export default {
   login,
   deposit,
+  mine,
 };

http/interface.js

@@ -4,8 +4,7 @@
  */
 export default {
   config: {
-  //  baseUrl: "http://192.168.88.175:9021",
-    baseUrl: "http://172.16.100.93:8017",
+    baseUrl: "https://warehouse.szjixun.cn", //"http://172.16.100.93:8017", //"http://192.168.88.175:9021",//'https://warehouse.szjixun.cn'
     header: {
       "Content-Type": "application/json;charset=UTF-8",
       // 'Content-Type':'application/x-www-form-urlencoded'

http/login.js

@@ -24,8 +24,34 @@ export const register = (data) => {
     data,
   });
 };
+// 身份验证
+export const chenckId = (data) => {
+  return http.request({
+    url: "/api/wxuser/ocr",
+    method: "POST",
+    data,
+  });
+};
+// 法大大
+export const fddRealName = (data) => {
+  return http.request({
+    url: "/api/wxuser/bind/fdd",
+    method: "POST",
+    data,
+  });
+};
+//法大大是否验证
+export const checkFdd = () => {
+  return http.request({
+    url: "/api/wxuser/fdd/check",
+    method: "POST",
+  });
+};
 export default {
   login,
   getTel,
   register,
+  chenckId,
+  fddRealName,
+  checkFdd,
 };

http/mine.js

@@ -0,0 +1,34 @@
+import http from "./interface";
+
+const infoOrders = () => {
+  return http.request({
+    url: "/api/warehouse/static/info",
+    method: "POST",
+  });
+};
+const info = () => {
+  return http.request({
+    url: "/api/wxuser/info",
+    method: "POST",
+  });
+};
+// 更新信息
+const update = (data) => {
+  return http.request({
+    url: "/api/wxuser/update",
+    method: "POST",
+    data,
+  });
+};
+const logout = () => {
+  return http.request({
+    url: "/api/wxuser/remove",
+    method: "POST",
+  });
+};
+export default {
+  infoOrders,
+  info,
+  update,
+  logout,
+};

pages.json

@@ -35,6 +35,16 @@
 				}
 			}
 		},
+		{
+			"path": "pages/realName/FDDRegister",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false // 禁用原生导航
+				}
+			}
+		},
 		{
 			"path": "pages/cameraContext/cameraContext",
 			"style": {

pages/home/index.vue

@@ -1,16 +1,16 @@
 
 
 <template>
-  <view :style="{background:'url('+'../../static/bbj1@3x.png'+')'}" class="main">
+  <view class="main">
     <title-block style="flex-shrink: 0;width: 100%" title="寄存"></title-block>
     <view class="order" @click="goConsignmen">
       <view class="order-item">
         <image src="@/static/image/write.png" mode="scaleToFill" style="width: 63rpx;height: 62rpx" />
         <view style="color: #fff;margin-top:10rpx">填写下单</view>
       </view>
-      <view class="order-item" style="background:#76C458 ;" @click.stop="scanOrder">
+      <view class="order-item" style="background:#76C458;" @click.stop="scanOrder">
         <image src="@/static/image/scan.png" mode="scaleToFill" style="width: 57rpx;height: 57rpx" />
-        <view style="color: #fff;margin-top:10rpx" >扫码下单</view>
+        <view style="color: #fff;margin-top:10rpx">扫码下单</view>
       </view>
     </view>
     <view class="list">
@@ -19,7 +19,7 @@
       <view v-for="(item,index) in addressList" :key="item.ID">
         <view class="list-item">
           <view>{{item.address}}</view>
-          <view>剩余{{item.deletedAt}}位置</view>
+          <view>剩余{{item.leftNum}}位置</view>
         </view>
         <u-divider :dashed="true" lineColor="#4E964D" v-if="index !== addressList.length-1"></u-divider>
       </view>
@@ -51,9 +51,7 @@ export default {
       uni.scanCode({
         onlyFromCamera: false,
         success: res => {
-          console.log(res.result,' res.result')
           console.log("条码类型：" + res.scanType);
-          console.log(res.scanType,'scanType')
           console.log("条码内容：" + res.result);
           uni.navigateTo({
             url: "/pages/consignment-painting/index?url=" + res.result
@@ -85,7 +83,8 @@ export default {
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 10rpx 30rpx 30rpx 30rpx;
+  padding: 0 30rpx;
+  background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
 
   .order {
     width: 100%;

pages/login/login.vue

@@ -7,7 +7,8 @@
         open-type="getPhoneNumber"
         @getphonenumber="getPhoneNumber"
         color="transparent"
-      >点击登录</u-button>
+        text="点击登录"
+      ></u-button>
     </view>
     <!-- <view class="btn">
       <u-button v-if="isLogoutShow" @click="login" color="transparent">点击登录</u-button>
@@ -21,73 +22,88 @@ export default {
     return {
       code: "",
       openId: "",
-      isShow: true,
-      isLogoutShow: true
+      isShow: false,
+      isNew: false
     };
   },
   methods: {
     async getPhoneNumber(e) {
-      console.log(e);
       if (e.detail.errMsg == "getPhoneNumber:ok") {
         // 用户允许或去手机号
         let res = await this.$api.login.getTel({ code: e.detail.code });
         if (res.status == 0) {
           uni.setStorageSync("telNum", res.data.telNum);
-          uni.redirectTo({
-            url: "/pages/realName/realName"
-          });
+          console.log(1231111111, this.isNew);
+          if (this.isNew) {
+            uni.reLaunch({
+              url: "/pages/realName/realName"
+            });
+          } else {
+            uni.reLaunch({
+              url: "/pages/home/index"
+            });
+          }
         } else {
           this.$common.msgToast(res.msg);
         }
       } else {
         this.$common.msgToast("请不要拒绝哟~重新点击登录");
       }
+    },
+    //获取openId
+    async getOpenId() {
+      uni.login({
+        provider: "weixin",
+        success: async res => {
+          console.log("res.code", res.code);
+          this.code = res.code;
+          let res1 = await this.$api.login.login({ code: res.code });
+          if (res1.status == 0) {
+            this.isShow = true;
+            this.isNew = res1.data.accountInfo.isNew;
+            uni.setStorageSync("token", res1.data.token);
+            // if (res1.data.accountInfo.isNew) {
+            //   this.openId = res1.data.accountInfo.openId;
+            //   uni.setStorageSync("token", res1.data.token);
+            //   uni.reLaunch({
+            //     url: "/pages/realName/realName"
+            //   });
+            // } else {
+            //   uni.setStorageSync("token", res1.data.token);
+            //   uni.reLaunch({
+            //     url: "/pages/home/index"
+            //   });
+            // }
+          } else {
+            this.$common.msgToast(res1.msg);
+          }
+        }
+      });
+    },
+    // info判断用户是401就让他获取openId
+    async info() {
+      const res = await this.$api.mine.info();
+      if (res.status === 0) {
+        if (res.data.isNew) {
+          //登录未注册
+          uni.reLaunch({
+            url: "/pages/realName/realName"
+          });
+        } else {
+          //登录已注册
+          uni.reLaunch({
+            url: "/pages/home/index"
+          });
+        }
+      } else if (res.status === 401) {
+        this.getOpenId();
+      } else {
+        this.$common.msgToast(res.msg);
+      }
     }
-    // async login() {
-    //   // 获取code
-    //   uni.login({
-    //     provider: "weixin",
-    //     success: async res => {
-    //       console.log(res);
-    //       this.code = res.code;
-    //       let res1 = await this.$api.login.login({ code: res.code });
-    //       if (res1.status == 0) {
-    //         this.isShow = true;
-    //         this.openId = res1.data.accountInfo.openId;
-    //         uni.setStorageSync("token", res1.data.token);
-    //         uni.redirectTo({
-    //           url: "/pages/register/register"
-    //         });
-    //       } else {
-    //         this.$common.msgToast(res1.msg);
-    //       }
-    //     }
-    //   });
-    // }
   },
   onLoad() {
-    uni.login({
-      provider: "weixin",
-      success: async res => {
-        console.log("res.code", res.code);
-        this.code = res.code;
-        let res1 = await this.$api.login.login({ code: res.code });
-        if (res1.status == 0) {
-          if (res1.data.accountInfo.isNew) {
-            this.isShow = true;
-            this.openId = res1.data.accountInfo.openId;
-            uni.setStorageSync("token", res1.data.token);
-          } else {
-            uni.setStorageSync("token", res1.data.token);
-            uni.redirectTo({
-              url: "/pages/home/index"
-            });
-          }
-        } else {
-          this.$common.msgToast(res1.msg);
-        }
-      }
-    });
+    this.info();
   }
 };
 </script>

pages/mine/index.vue

@@ -1,30 +1,30 @@
 <template>
-<div class="mine" :style="{background:'url('+'../../static/bbj1@3x.png'+')'}">
+<div class="mine" >
   <div class="content1">
     <div class="wrap1">
-      <div class="wrap1_1">203</div>
+      <div class="wrap1_1">{{orderTotal}}</div>
       <div class="wrap1_2">当前订单总量</div>
     </div>
     <div class="wrap2"></div>
     <div class="wrap3">
-      <div class="wrap3_1">19</div>
+      <div class="wrap3_1">{{validContractDays}}</div>
       <div class="wrap3_2">当前有效合同数</div>
     </div>
   </div>
   <div class="content2">
     <div class="wrap1">
       <div class="wrap1_1">
-        <image src="../../static/06@3x.png"></image>
+        <image :src="avatar"></image>
       </div>
       <div class="wrap1_2">
         <div class="wrap1_2_1">
-          <div class="wrap1_2_1_1">某某某</div>
+          <div class="wrap1_2_1_1">{{nickName}}</div>
           <div class="wrap1_2_1_2">已实名</div>
         </div>
-        <div class="wrap1_2_2">178273938123</div>
+        <div class="wrap1_2_2">{{telNum}}</div>
       </div>
     </div>
-    <div class="wrap2">
+    <div class="wrap2" @click="goSet" >
       <div class="wrap2_1">
         <image src="../../static/zu609@3x.png"></image>
       </div>
@@ -42,7 +42,46 @@ export default {
   onLoad() {
     uni.hideTabBar()
   },
-  components: {tabbar}
+  components: {tabbar},
+  data() {
+    return {
+      orderTotal:0,
+      validContractDays:0,
+      nickName:'',
+      telNum:'',
+      avatar:''
+    }
+  },
+  onLoad(){
+    this.infoOrders()
+    this.info()
+  },
+  methods: {
+    async infoOrders(){
+      const res = await this.$api.mine.infoOrders()
+      if(res.status === 0){
+        this.orderTotal = res.data.totalCount
+        this.validContractDays = res.data.nowCount
+      }else{
+        this.$common.msgToast(res.msg);
+      }
+    },
+    async info(){
+      const res = await this.$api.mine.info()
+      if(res.status === 0){
+        this.nickName = res.data.user.nickName
+        this.telNum = res.data.user.telNum
+        this.avatar = res.data.user.avatar
+      }else{
+        this.$common.msgToast(res.msg);
+      }
+    },
+    goSet(){
+      uni.navigateTo({
+         url: '/pages/mine/set-up'
+      });
+    }
+  },
 }
 </script>
 <style scoped lang="scss">
@@ -54,6 +93,8 @@ export default {
   background-size: cover;
   width: 100vw;
   height: 100vh;
+  background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
+
   .content2{
     margin-top: 30rpx;
     display: flex;

pages/mine/set-up.vue

@@ -1,76 +1,141 @@
 <template>
-<div class="set-up" >
-  <title-block title="设置">
-    <template #left>
-      <div> <image style="width: 112rpx;height: 52rpx" src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png"></image></div>
-    </template>
-  </title-block>
-  <div class="content2">
-    <div class="wrap1">
-      <image src="../../static/06@3x.png"></image>
-    </div>
-    <div class="wrap2">
-      <div class="wrap2_1">恢复默认头像</div>
-      <div class="wrap2_2">更换头像</div>
-    </div>
-  </div>
-  <div class="content3">
-    <div class="wrap1">
-      <div class="wrap1_1">
-        <div class="wrap1_1_1">画作编号</div>
-        <div class="wrap1_1_2"></div>
-        <div class="wrap1_1_3">
-          <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="画作编号" />
+  <div class="set-up">
+    <title-block title="设置">
+      <template #left>
+        <div>
+          <image style="width: 112rpx;height: 52rpx"
+          src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png" @click="back">
+          </image>
         </div>
-        <div class="wrap1_1_4"></div>
+      </template>
+    </title-block>
+    <div class="content2">
+      <div class="wrap1">
+        <image :src="user.avatar ? user.avatar:'https://cdns.fontree.cn/fonchain-main/prod/image/407e7c22-eb62-411e-957b-b6c296fde530/artwork/814ac246-e1eb-49fe-beee-dd53aaf5d309.png'" mode="scaleToFill"></image>
       </div>
-      <div class="wrap1_1">
-        <div class="wrap1_1_1">画作名称</div>
-        <div class="wrap1_1_2"></div>
-        <div class="wrap1_1_3">
-          <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="画作名称" />
-        </div>
-        <div class="wrap1_1_4"></div>
-      </div>
-      <div class="wrap1_1">
-        <div class="wrap1_1_1">画家名称</div>
-        <div class="wrap1_1_2"></div>
-        <div class="wrap1_1_3">
-          <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="画家名称" />
-        </div>
-        <div class="wrap1_1_4">
-        </div>
-      </div>
-      <div class="wrap1_1">
-        <div class="wrap1_1_1">画作平尺数</div>
-        <div class="wrap1_1_2"></div>
-        <div class="wrap1_1_3">
-          <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="画作平尺数" />
-        </div>
+      <div class="wrap2">
+        <div class="wrap2_1" @click="backDafult">恢复默认头像</div>
+        <u-upload :fileList="fileList" name="1" multiple :maxCount="1" @afterRead="changeAvatar">
+          <view style="width:348rpx;height:56rpx;margin-top:20rpx">
+            <u-button text="更换头像" shape="circle" class="size" color="#76C458"></u-button>
+          </view>
+        </u-upload>
       </div>
     </div>
-    <div class="wrap2"></div>
+    <div class="content3">
+      <div class="wrap1">
+        <div class="wrap1_1">
+          <div class="wrap1_1_1">姓名</div>
+          <div class="wrap1_1_2">{{ user.nickName }}</div>
+          <div class="wrap1_1_3">
+            <view></view>
+          </div>
+          <div class="wrap1_1_4"></div>
+        </div>
+        <div class="wrap1_1">
+          <div class="wrap1_1_1">身份证号码</div>
+          <div class="wrap1_1_2">{{ user.iDNum }}</div>
+          <div class="wrap1_1_3">
+            <view></view>
+          </div>
+          <div class="wrap1_1_4"></div>
+        </div>
+        <div class="wrap1_1">
+          <div class="wrap1_1_1">手机号</div>
+          <div class="wrap1_1_2">{{ user.telNum }}</div>
+          <div class="wrap1_1_3">
+            <view></view>
+          </div>
+        </div>
+      </div>
+      <div class="wrap2"></div>
+    </div>
+    <div class="content4">
+      <div class="wrap1" @click="logout">注销账号</div>
+      <div class="wrap2" @click="quit">退出登录</div>
+    </div>
   </div>
-  <div class="content4">
-    <div class="wrap1">注销账号</div>
-    <div class="wrap2">退出登录</div>
-  </div>
-</div>
 </template>
 <script>
+import http from "@/http/api";
 export default {
   name: "set-up",
-  data(){
-    return{
-      statusBarHeight:uni.getSystemInfoSync().statusBarHeight+10
+  data() {
+    return {
+      user: {}
+    }
+  },
+  onLoad() {
+    this.info()
+  },
+  methods: {
+    async info() {
+      const res = await this.$api.mine.info()
+      if (res.status === 0) {
+        this.user = res.data.user
+      } else {
+        this.$common.msgToast(res.msg);
+      }
+    },
+    changeAvatar(file) {
+      console.log(file)
+      this.uploadFilePromise(file.file[0].url);
+    },
+    uploadFilePromise(url) {
+      return new Promise((resolve) => {
+        uni.uploadFile({
+          url: http.baseUrl + "/api/wxuser/uploadpic",
+          filePath: url,
+          name: "file",
+          success: (res) => {
+            res.data = JSON.parse(res.data);
+            resolve(res.data.data.path);
+            this.updateInfo({
+              avatar: res.data.data.path,
+            });
+          },
+        });
+      });
+    },
+   async updateInfo(data){
+			let res = await this.$api.mine.update(data);
+			if (res.status === 0) {
+        this.$common.msgToast('修改成功');
+				this.info();
+			} else {
+				    this.$common.msgToast(res.msg);
+			}
+    },
+    backDafult() {
+			this.updateInfo({
+				avatar: "https://cdns.fontree.cn/fonchain-main/prod/image/407e7c22-eb62-411e-957b-b6c296fde530/artwork/814ac246-e1eb-49fe-beee-dd53aaf5d309.png",
+			});
+		},
+    quit(){
+      uni.clearStorageSync();
+      uni.navigateTo({
+        url: '/pages/login/login'
+      })
+    },
+   async logout(){
+			let res = await this.$api.mine.logout();
+			if (res.status === 0) {
+        this.$common.msgToast('注销成功');
+				this.quit();
+			} else {
+				    this.$common.msgToast(res.msg);
+			}
+    },
+    back(){
+      uni.navigateBack({
+         delta: 2
+      });
     }
   },
-  mounted(){
-  }
 }
 </script>
 <style scoped lang="scss">
-.set-up{
+.set-up {
   background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
   position: relative;
   box-sizing: border-box;
@@ -80,13 +145,15 @@ export default {
   background-size: cover;
   width: 100vw;
   height: 100vh;
-  .content4{
-left: 50%;
+
+  .content4 {
+    left: 50%;
     transform: translateX(-50%);
     bottom: 104rpx;
     position: absolute;
     display: flex;
-    .wrap2{
+
+    .wrap2 {
       margin-left: 38rpx;
       color: #fff;
       display: flex;
@@ -98,7 +165,8 @@ left: 50%;
       height: 56rpx;
       background: #3E3E3E;
     }
-    .wrap1{
+
+    .wrap1 {
       color: #fff;
       display: flex;
       justify-content: center;
@@ -110,21 +178,24 @@ left: 50%;
       background: #ED6666;
     }
   }
-  .content2{
+
+  .content2 {
     margin-top: 60rpx;
     display: flex;
     align-items: center;
     justify-content: center;
-    .wrap1{
-      image{
+
+    .wrap1 {
+      image {
         height: 154rpx;
         width: 154rpx;
       }
     }
-    .wrap2{
+
+    .wrap2 {
       margin-left: 42rpx;
 
-      .wrap2_2{
+      .wrap2_2 {
         margin-top: 20rpx;
         display: flex;
         justify-content: center;
@@ -136,31 +207,35 @@ left: 50%;
         background: #76C458;
         border-radius: 40rpx;
       }
-.wrap2_1{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 348rpx;
-  height: 56rpx;
-  color: #fff;
-  font-size: 32rpx;
-  background: #000;
-  border-radius: 40rpx;
-}
+
+      .wrap2_1 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 348rpx;
+        height: 56rpx;
+        color: #fff;
+        font-size: 32rpx;
+        background: #000;
+        border-radius: 40rpx;
+      }
     }
   }
 
-  .content3{
+  .content3 {
     margin-top: 60rpx;
-    .wrap1{
+
+    .wrap1 {
       border: 1rpx dashed #DFE9F0;
       background-color: #fff;
-      .wrap1_1{
+
+      .wrap1_1 {
         position: relative;
         height: 114rpx;
         display: flex;
         align-items: center;
-        .wrap1_1_4{
+
+        .wrap1_1_4 {
           left: 50%;
           transform: translateX(-50%);
           bottom: 0;
@@ -169,14 +244,18 @@ left: 50%;
           width: 636rpx;
           border-bottom: 0.5px solid #626262;
         }
-        .wrap1_1_2{
+
+        .wrap1_1_2 {
           margin-right: 36rpx;
           width: 0;
           height: 66rpx;
           border-left: 0.5px solid #626262;
-
+          line-height: 66rpx;
+          width: 100%;
+          padding-left: 20rpx;
         }
-        .wrap1_1_1{
+
+        .wrap1_1_1 {
           width: 210rpx;
           padding-left: 32rpx;
 

pages/order-goods/index.vue

@@ -55,7 +55,7 @@
             <div class="wrap1_3_1" v-if="item.artworkStatus===4">
               <div class="wrap1_3_1_1">{{ item.endAt }}</div>
               <div class="wrap1_3_1_2">已延期</div>
-              <div class="wrap1_3_1_3" @click.stop="openShow2(item)">点击补款</div>
+              <div class="wrap1_3_1_3" v-if="item.isSupplementary" @click.stop="openShow2(item)">点击补款</div>
             </div>
             <div class="wrap1_3_3" v-if="item.artworkStatus!==4">
               <div class="wrap1_3_3_1">{{ statusValue.find(x => x.value === item.artworkStatus).label }}</div>
@@ -240,9 +240,8 @@ export default {
 
 .order-goods {
   overflow: hidden;
-  background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
   box-sizing: border-box;
-
+  background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
   padding-left: 30rpx;
   padding-right: 30rpx;
   background-size: cover;

pages/paySuccess/paySuccess.vue

@@ -1,49 +1,49 @@
 <template>
   <view class="main">
     <image
-      src="@/static/image/paySuccess.png"
-      mode="scaleToFill"
-      style="width:218rpx;height:54rpx;margin-top:150rpx"
+        src="@/static/image/paySuccess.png"
+        mode="scaleToFill"
+        style="width:218rpx;height:54rpx;margin-top:150rpx"
     />
     <view class="info">
       <view>
-        <image src="../../static/bbj1@3x.png" mode="scaleToFill" style="width:191rpx;height:146rpx" />
+        <image src="../../static/bbj1@3x.png" mode="scaleToFill" style="width:191rpx;height:146rpx"/>
       </view>
       <view class="info-right">
         <view class="info-right-item">
           <view class="title">画作编号</view>
-          <view class="content">{{info.artworkNum}}</view>
+          <view class="content">{{ info.artworkNum }}</view>
         </view>
         <view class="info-right-item">
           <view class="title">画作名称</view>
-          <view class="content">{{info.artworkName}}</view>
+          <view class="content">{{ info.artworkName }}</view>
         </view>
         <view class="info-right-item">
           <view class="title">画家名称</view>
-          <view class="content">{{info.artistName}}</view>
+          <view class="content">{{ info.artistName }}</view>
         </view>
         <view class="info-right-item">
           <view class="title">画作平尺数</view>
-          <view class="content">{{info.artworkSize}}</view>
+          <view class="content">{{ info.artworkSize }}</view>
         </view>
       </view>
     </view>
     <view class="order-info">
       <view class="info-right-item">
         <view class="title">订单编号</view>
-        <view class="content">{{info.artworkNum}}</view>
+        <view class="content">{{ info.artworkNum }}</view>
       </view>
       <view class="info-right-item">
         <view class="title">寄存地址</view>
-        <view class="content">{{info.warehouseName}}</view>
+        <view class="content">{{ info.warehouseName }}</view>
       </view>
       <view class="info-right-item">
         <view class="title">寄存时限</view>
-        <view class="content">{{info.cycleName}}</view>
+        <view class="content">{{ info.cycleName }}</view>
       </view>
       <view class="info-right-item">
         <view class="title">付款金额</view>
-        <view class="content">{{info.money}}</view>
+        <view class="content">{{ info.money }}</view>
       </view>
     </view>
     <view class="tips">*请携带您的画作在时限之前到达寄存地</view>
@@ -62,21 +62,24 @@
 import {postDataByParams} from "../../http/service";
 
 export default {
-  name:'paySuccess',
-  data(){
-    return{
-      info:{}
+  name: 'paySuccess',
+  data() {
+    return {
+      info: {}
     }
   },
-  mounted(){
+  mounted() {
     this.getData()
   },
-  methods:{
-   async getData(){
-     const data1={
-       ID:Number(this.$mp.query.ID)
-     }
-      const res1 = await postDataByParams('/api/warehouse/detail',data1)
+  methods: {
+    async getData() {
+      const data1 = {
+        ID: Number(this.$mp.query.ID)
+      }
+      const res1 = await postDataByParams('/api/warehouse/detail', data1)
+      if (res1.code === 200) {
+        this.info = res1.data
+      }
     }
   }
 };
@@ -92,18 +95,22 @@ export default {
   align-items: center;
   padding: 32rpx;
   flex-direction: column;
+
   .info-right-item {
     color: #626262;
     display: flex;
     align-items: center;
+
     .title {
       padding-right: 56rpx;
       border-right: 1rpx solid #e4eaf1;
     }
+
     .content {
       padding-left: 34rpx;
     }
   }
+
   .info {
     box-sizing: border-box;
     display: flex;
@@ -113,6 +120,7 @@ export default {
     background: #fff;
     margin-top: 182rpx;
     padding: 20rpx;
+
     .info-right {
       width: 100%;
       margin-left: 34rpx;
@@ -122,6 +130,7 @@ export default {
       justify-content: space-between;
     }
   }
+
   .order-info {
     box-sizing: border-box;
     margin-top: 20rpx;
@@ -134,10 +143,12 @@ export default {
     flex-direction: column;
     justify-content: space-between;
   }
+
   .tips {
     color: #76c458;
     margin-top: 170rpx;
   }
+
   .btns {
     margin-top: 40rpx;
     width: 100%;

pages/realName/FDDRegister.vue

@@ -0,0 +1,33 @@
+<template>
+  <view>
+    <web-view :src="fddUrl" bindmessage="handleMessage"></web-view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      fddUrl: ""
+    };
+  },
+  onLoad() {
+    uni.getStorage({
+      key: "fddUrl",
+      success: res => {
+        this.$nextTick(() => {
+          this.fddUrl = res.data;
+        });
+      }
+    });
+  },
+  methods: {
+    handleMessage(e) {
+      console.log(e, "fffffffffffffffffffffffffffff");
+    }
+  }
+};
+</script>
+
+<style>
+</style>

pages/realName/realName.vue

@@ -7,7 +7,7 @@
             <view class="head">
                 <view style="display:flex; align-items: center;">
                     <view class="title">注册手机号</view>
-                    <view :style="{ fontSize: '18rpx' }">*实名认证失败</view>
+                    <!-- <view :style="{ fontSize: '18rpx' }">*实名认证失败</view> -->
                     <!-- <view>*实名认证成功</view> -->
                 </view>
                 <view style="color:#7FA770;font-size:24rpx;margin-left:36rpx">此实名仅用于注册该小程序</view>
@@ -50,7 +50,7 @@
             </view>
             <view class="face">
                 <view class="faceTitle">人脸识别</view>
-                <view class="recognition" @click="camera" v-if="!isfinish">
+                <view class="recognition" @click="camera" v-if="!video">
                     <view style="color: #fff;margin-right:10rpx">前往认证</view>
                     <u-icon name="arrow-right-double" color="#fff"></u-icon>
                 </view>
@@ -59,6 +59,17 @@
                     <u-icon name="checkmark-circle" color="#fff"></u-icon>
                 </view>
             </view>
+            <view class="face">
+                <view class="faceTitle">法大大认证</view>
+                <view class="recognition" @click="fddRealName" v-if="!isFdd">
+                    <view style="color: #fff;margin-right:10rpx">前往认证</view>
+                    <u-icon name="arrow-right-double" color="#fff"></u-icon>
+                </view>
+                <view class="recognition" @click="fddRealName" v-else>
+                    <view style="color: #fff;margin-right:10rpx">认证成功</view>
+                    <u-icon name="checkmark-circle" color="#fff"></u-icon>
+                </view>
+            </view>
             <view class="agreement">
                 <u-checkbox-group v-model="checked" iconPlacement="left" placement="row" inactiveColor="#76C458">
                     <u-checkbox name="yes" shape="circle" activeColor="#76C458"></u-checkbox>
@@ -86,16 +97,30 @@ export default {
             fileList: [],
             fileList2: [],
             video: '',
-            isfinish: false
+            isfinish: false,
+            isChecked: false
         };
     },
-    onLoad(options) {
-        this.video = options.tempVideoPath;
-        this.isfinish = JSON.parse(options.isfinish)||false
-        this.name =  uni.getStorageSync("info").name
-        this.num = uni.getStorageSync("info").num
-        this.fileList = uni.getStorageSync("info").fileList
-        this.fileList2 = uni.getStorageSync("info").fileList2
+   async onLoad(options) {
+        if (options.tempVideoPath) {
+            this.isfinish = JSON.parse(options.isfinish) || false  
+            this.video  = await this.uploadFilePromise(options.tempVideoPath)
+            console.log('this.video',this.video)
+            const data = {
+                num: uni.getStorageSync("info").name || '',
+                name: uni.getStorageSync("info").num || '',
+                fileList: uni.getStorageSync("info").fileList || [],
+                fileList2: uni.getStorageSync("info").fileList2,
+                video: this.video
+            }
+            uni.setStorageSync("info", data)
+        }
+        this.name = uni.getStorageSync("info").name || ''
+        this.num = uni.getStorageSync("info").num || ''
+        this.fileList = uni.getStorageSync("info").fileList || []
+        this.fileList2 = uni.getStorageSync("info").fileList2 || []
+        this.video = uni.getStorageSync("info").video || ''
+        // this.isFdd = uni.getStorageSync("isFdd") || false
         uni.removeStorageSync("info")
     },
     methods: {
@@ -118,13 +143,6 @@ export default {
             uni.setStorageSync("info", data)
         },
         async completeRegistration() {
-            if (!this.checked.length) return this.$common.msgToast("请阅读并勾选协议");
-            if (!this.checked.length) return this.$common.msgToast("请阅读并勾选协议");
-            if (!this.name) return this.$common.msgToast("请输入姓名");
-            if (!this.num) return this.$common.msgToast("请输入身份证号");
-            if (!this.fileList.length) return this.$common.msgToast("请上传身份证人面像");
-            if (!this.fileList2.length) return this.$common.msgToast("请上传身份国徽面");
-            if (!this.video) return this.$common.msgToast("请上传人脸识别视频");
             console.log({
                 telNum: uni.getStorageSync("telNum"),
                 realNameIDName: this.num,
@@ -133,19 +151,32 @@ export default {
                 realIDImgA: this.fileList[0]?.url,
                 realIDImgB: this.fileList2[0].url
             })
-            const res = await this.$api.login.register({user:{
-                telNum: uni.getStorageSync("telNum"),
-                realNameIDName: this.num,
-                realName: this.name,
-                video: this.video,
-                realIDImgA: this.fileList[0]?.url,
-                realIDImgB: this.fileList2[0]?.url
-            }})
+            this.checkFdd().then((res) => {
+                if (!res) return this.$common.msgToast("法大大验证未通过")
+            })
+            if (!this.checked.length) return this.$common.msgToast("请阅读并勾选协议");
+            if (!this.checked.length) return this.$common.msgToast("请阅读并勾选协议");
+            if (!this.name) return this.$common.msgToast("请输入姓名");
+            if (!this.num) return this.$common.msgToast("请输入身份证号");
+            if (!this.fileList.length) return this.$common.msgToast("请上传身份证人面像");
+            if (!this.fileList2.length) return this.$common.msgToast("请上传身份国徽面");
+            if (!this.video) return this.$common.msgToast("请上传人脸识别视频");
+
+            const res = await this.$api.login.register({
+                user: {
+                    telNum: uni.getStorageSync("telNum"),
+                    realNameIDName: this.num,
+                    realName: this.name,
+                    video: this.video,
+                    realIDImgA: this.fileList[0]?.url,
+                    realIDImgB: this.fileList2[0]?.url
+                }
+            })
             if (res.status === 0) {
-                uni.navigateTo({
+                uni.switchTab({
                     url: '/pages/home/index'
                 });
-            }else{
+            } else {
                 this.$common.msgToast(res.msg)
             }
 
@@ -171,7 +202,8 @@ export default {
                 })
             })
             for (let i = 0; i < lists.length; i++) {
-                const result = await this.uploadFilePromise(lists[i].url)
+                const result = await this.uploadFilePromise(lists[i].url, 'check')
+                console.log(result)
                 let item = this[`fileList`][fileListLen]
                 this[`fileList`].splice(fileListLen, 1, Object.assign(item, {
                     status: 'success',
@@ -203,19 +235,71 @@ export default {
                 fileListLen++
             }
         },
-        uploadFilePromise(url) {
+        uploadFilePromise(url, type = null) {
             return new Promise((resolve) => {
                 uni.uploadFile({
                     url: http.baseUrl + "/api/wxuser/uploadpic",
                     filePath: url,
                     name: "file",
                     success: (res) => {
-                        res.data = JSON.parse(res.data);
-                        resolve(res.data.data.path);
+                        const { path } = JSON.parse(res.data).data;
+                        console.log('@@@@', path)
+                        resolve(path);
+                        if (type === 'check') {
+                            this.chenckId(path)
+                        }
                     },
                 });
-            });
+            })
         },
+        async chenckId(realIDImgA) {
+            const res = await this.$api.login.chenckId({ realIDImgA })
+            if (res.status === 0) {
+                this.num = res.data.iDNum
+                this.name = res.data.realName
+            } else {
+                this.$common.msgToast(res.msg)
+            }
+        },
+        async fddRealName() {
+            const data = {
+                num: this.num,
+                name: this.name,
+                fileList: this.fileList,
+                fileList2: this.fileList2,
+                video: this.video
+            }
+            console.log(data, 'data')
+            uni.setStorageSync("info", data)
+            const mobile = uni.getStorageSync("telNum")
+            const res = await this.$api.login.fddRealName({
+                customerName: this.name,
+                customerIdentNo: this.num,
+                mobile
+            })
+            if (res.status === 0) {
+                uni.setStorage({
+                    key: "fddUrl",
+                    data: res.data?.url,
+                    success: function () {
+                        uni.navigateTo({
+                            url: "/pages/realName/FDDRegister",
+                        });
+                    },
+                });
+            } else {
+                this.$common.msgToast(res.msg)
+            }
+        },
+        checkFdd() {
+            return this.$api.login.checkFdd().then((res) => {
+                if (res.status === 0) {
+                    return res.data.isVerify
+                } else {
+                    this.$common.msgToast(res.msg)
+                }
+            })
+        }
     }
 };
 </script>