v301

miniprogram/apis/consumer.ts

@@ -16,3 +16,10 @@ export function bindPhoneList() {
     
   })
 }
+export function phoneChose(data: any) {
+  return request({
+    url: '/consumer/phoneChose',
+    method: 'POST',
+    data
+  })
+}

miniprogram/apis/phone.ts

@@ -28,9 +28,10 @@ export function evaluateLaunch(data: any) {
     data
   })
 }
-export function cleanPhoneDate(phone: any) {
+export function cleanPhoneDate(phone: any, name: any) {
   return request({
-    url: `/phone/cleanPhoneDate?phone=${phone}`,
+    // url: `/phone/cleanPhoneDate?phone=${phone}`,
+    url: `/phone/cleanPhoneDate?phone=${phone}&name=${name}`,
     method: 'DELETE',
   })
 }
@@ -50,3 +51,11 @@ export function labelStatistics(phone: string) {
     method: 'GET',
   })
 }
+
+
+export function getCleanReturn() {
+  return request({
+    url: `/phone/getCleanReturn`,
+    method: 'GET',
+  })
+}

miniprogram/app.ts

@@ -100,14 +100,13 @@ App<IAppOption>({
             }).then((res: any) => {
               wx.setStorageSync('Authorization', res.d)
               // this.getBindPhoneList()
-              bindPhoneList().then(res => {
-                // wx.setStorageSync('accountList', res.d)
-                // this.globalData.accountList = res.d
-                wx.setStorageSync('accountList', res.d)
-                console.log(wx.getStorageSync('userInfo').phone,res.d);
               
+              resolve(true)
+              console.log('resolve');
+              bindPhoneList().then(res => {
+                console.log('##2##',res);
+                wx.setStorageSync('accountList', res.d)
                 wx.setStorageSync('userInfo', res.d.find(item => item.phone === wx.getStorageSync('userInfo').phone) || res.d[0])
-                // this.globalData.userInfo = res.d[0]
               })
               // this.getUserInfo().then(() => {
               //   resolve(true)

miniprogram/components/dialog/dialog.wxml

@@ -5,7 +5,7 @@
     <btnClose bindtap="close" />
     <view class="dialog_title">提示</view>
     <view class="dialog_content" bindtap="hidden">
-      <text>您即将进入全国人力资源信息数据验证平台，邀请对方授权个人信息报告，操作流程如下：</text>
+      <text>{{position!=='my'?'您即将进入全国人力资源信息数据验证平台，邀请对方授权个人信息报告，操作流程如下':'您即将进入全国人力资源信息数据验证平台，生成个人信息报告，操作流程如下：'}}</text>
       <view class="timeLine">
         <view class="timeLine_item">
           <view class="step">1</view>

miniprogram/components/guide/guide.scss

@@ -1,28 +1,29 @@
 /* components/guide/guide.wxss */
-.guide-cmp {
+.route{
-  font-size: 24rpx;
-  // font-weight: bold;
-  // font-family: YouSheBiaoTiHei;
-  // font-weight: 400;
-  color: #FFFFFF;
   position: fixed;
   top: 30rpx;
   right: 0;
   z-index: 100;
+}
+.guide-cmp {
+  font-size: 24rpx;
+  color: #FFFFFF;
+  // position: fixed;
+  // top: 30rpx;
+  // right: 0;
+  // z-index: 100;
   // background: #3A61B1;
-  width: 172rpx;
+  width: 140rpx;
   height: 50rpx;
   border: 1px solid #FFFFFF;
   border-right: 0;
   border-radius: 25px 0px 0px 25px;
   font-family: PingFang SC;
   font-weight: 500;
-  // border-top-left-radius: 20rpx;
-  // border-bottom-left-radius: 20rpx;
   display: flex;
   justify-content: center;
   align-items: center;
-  // font-style: italic;
+  margin-bottom: 10rpx;
 
   .icon_guideClose {
     width: 11rpx;
@@ -148,9 +149,15 @@
 }
 
 .my {
-  width: 127rpx;
+  width: 142rpx;
   height: 58rpx;
   background: #6571D9;
   border-radius: 29rpx 0px 0px 29rpx;
   border: 0;
+  padding-left: 1px;
+}
+
+.icon_search {
+  width: 19rpx;
+  height: 21rpx;
 }

miniprogram/components/guide/guide.ts

@@ -10,7 +10,7 @@ Component({
     },
     title: {
       type: String,
-      value: '查看我的号码'
+      value: '我的主页'
     }
   },
 

miniprogram/components/guide/guide.wxml

@@ -1,5 +1,23 @@
 <!--components/guide/guide.wxml-->
-<view wx:if="{{title!=='查号码'}}" class="guide-cmp" bind:tap="guideShow">{{title}}</view>
+<!-- <view wx:if="{{title!=='查号码'}}" class="guide-cmp" bind:tap="guideShow">{{title}}</view>
 <view wx:else class="guide-cmp my" bind:tap="goSearch">
   <image class="icon_search" src="./images/icon_search.png"></image>查号码
+</view> -->
+<view class="route">
+  <block wx:if="{{title!=='我的主页'}}">
+    <view class="guide-cmp my" bind:tap="goSearch">
+      <image class="icon_search" src="./images/icon_search.png"></image>查号码
+    </view>
+    <view class="guide-cmp" bind:tap="guideShow">
+      <image class="icon_search" src="/assets/images/searchResult/icon_my.png"></image>我的主页
+    </view>
+  </block>
+  <block wx:else>
+    <view class="guide-cmp my" bind:tap="goSearch">
+      <image class="icon_search" src="./images/icon_search.png"></image>查号码
+    </view>
+    <!-- <view class="guide-cmp" bind:tap="guideShow">
+      <image class="icon_search" src="/assets/images/searchResult/icon_my.png"></image>我的主页
+    </view> -->
+  </block>
 </view>

miniprogram/components/star/star.ts

@@ -80,6 +80,33 @@ Component({
           bgImg_all: "/assets/images/searchResult/star_1.png"
         }
       ],
+      stars_half: [
+        {
+          bgImg: "/assets/images/searchResult/cStar_1.png",
+          bgImg_half: "/assets/images/searchResult/cStar_0.5.png",
+          bgImg_all: "/assets/images/searchResult/cStar_0.png"
+        },
+        {
+          bgImg: "/assets/images/searchResult/cStar_1.png",
+          bgImg_half: "/assets/images/searchResult/cStar_0.5.png",
+          bgImg_all: "/assets/images/searchResult/cStar_0.png"
+        },
+        {
+          bgImg: "/assets/images/searchResult/cStar_1.png",
+          bgImg_half: "/assets/images/searchResult/cStar_0.5.png",
+          bgImg_all: "/assets/images/searchResult/cStar_0.png"
+        },
+        {
+          bgImg: "/assets/images/searchResult/cStar_1.png",
+          bgImg_half: "/assets/images/searchResult/cStar_0.5.png",
+          bgImg_all: "/assets/images/searchResult/cStar_0.png"
+        },
+        {
+          bgImg: "/assets/images/searchResult/cStar_1.png",
+          bgImg_half: "/assets/images/searchResult/cStar_0.5.png",
+          bgImg_all: "/assets/images/searchResult/cStar_0.png"
+        }
+      ],
       cStars: [
         {
           bgImg: "/assets/images/searchResult/cStar.png",

miniprogram/components/userInfo/userInfo.scss

@@ -4,6 +4,14 @@
   display: flex;
   align-items: center;
   margin-bottom: 50rpx;
+  position: fixed;
+  background: #7B8EFF;
+  width: 100%;
+  left: 0;
+  top: 0rpx;
+  padding: 30rpx 0 0 30rpx;
+  height: 150rpx;
+  align-items: flex-start;
 
   .avatar {
     width: 77rpx;

miniprogram/components/userInfo/userInfo.ts

@@ -26,11 +26,13 @@ Component({
    */
   methods: {
     show() {
-      if (!this.data.realName) {
+      console.log('show');
+
+      // if (!this.data.realName) {
       this.setData({
         visible: true
       })
-      }
+      // }
     },
     close() {
       this.setData({

miniprogram/components/userInfo/userInfo.wxml

@@ -1,7 +1,9 @@
 <!--components/userInfo/userInfo.wxml-->
 <view class="userInfo_box">
   <image class="avatar" src="/assets/images/searchResult/a-ziyuan106@2x.png"></image>
-  <view class="username" bindtap="show">{{phone}}<image class="icon_noCertificate" src="/assets/images/searchResult/{{realName?'':'no'}}Certificate.png"></image>
+  <view class="username" bindtap="show">
+    {{phone}}
+    <image class="icon_noCertificate" src="/assets/images/searchResult/{{realName?'':'no'}}Certificate.png"></image>
   </view>
   <shadow position="center" wx:if="{{visible}}">
     <view class="dialog dialog_center">

miniprogram/pages/index/index.scss

@@ -1,7 +1,7 @@
 /**index.wxss**/
 page {
   background: #7E8BFF;
-  height: 100%;
+  // height: 100%;
   background: url("https://chrivc.obs.cn-north-4.myhuaweicloud.com/1cde69cc683a42219c12e8e7e4f6bed0:生意伙伴人品如何@2x.png");
   background-size: 100%;
 }

miniprogram/pages/index/index.ts

@@ -32,10 +32,22 @@ Page({
       })
       return
     }
-    if (phone.length !== 11) {
+    // if (phone.length !== 11) {
+    //   wx.showToast({
+    //     icon: 'none',
+    //     title: '手机号格式错误'
+    //   })
+    //   return
+    // }
+    // let reg = '';
+    // console.log((reg.test(phone))
+    
+    // console.log(/^1[3|4|5|7|8][0-9]{9}$/.test(phone));
+    
+    if (!/^1[3|4|5|7|8][0-9]{9}$/.test(phone)) {
       wx.showToast({
         icon: 'none',
-        title: '请输入手机号格式错误'
+        title: '手机号格式错误!'
       })
       return
     }
@@ -63,16 +75,17 @@ Page({
     wx.chooseContact({
       success: t => {
         let temp = t.phoneNumber.replaceAll('-', '').replaceAll(' ', '')
-        if (temp.length !== 11) {
+        let reg = /^1[3|4|5|7|8][0-9]{9}$/;
+        if (reg.test(temp)) {
+          this.setData({
+            phone:temp
+          })
+        }
+        else {
           wx.showToast({
             icon: 'none',
             title: '手机号格式错误!'
           })
-          return
-        } else {
-          this.setData({
-            phone: temp
-          })
         }
       },
       fail: e => console.log(e),

miniprogram/pages/index/index.wxml

@@ -25,7 +25,7 @@
     </view> -->
     <view class="input_contact">
       <image class="icon_search" src="/assets/images/index/icon_search.png"></image>
-      <input type="number" maxlength="11" type="text" placeholder="输入对方手机号码或通讯录选取" model:value="{{phone}}" />
+      <input type="number" maxlength="11" placeholder="输入对方手机号码或通讯录选取" model:value="{{phone}}" />
       <btn width="190rpx" height="57rpx" class="btn_contact" bindtap="handleContact">
         <image class="icon_contact" src="/assets/images/index/tongxunlu@2x.png"></image>通讯录选取
       </btn>

miniprogram/pages/login/login.ts

@@ -48,6 +48,13 @@ Page({
       })
       return
     }
+    if (!/^1[3|4|5|7|8][0-9]{9}$/.test(phone)) {
+      wx.showToast({
+        icon: 'none',
+        title: '手机号格式错误!'
+      })
+      return
+    }
     sendSms({
       phone,
     }).then(() => {

miniprogram/pages/my/my.scss

@@ -14,6 +14,13 @@ page {
     align-items: center;
     margin-bottom: 50rpx;
     padding: 30rpx 30rpx;
+    background: #7B8EFF;
+    // width: 100%;
+    // position: absolute;
+    // top: 0rpx;
+    // padding-top: 30rpx;
+    // height: 150rpx;
+    // align-items: flex-start;
 
     .btn_switch {
       font-size: 22rpx;
@@ -83,8 +90,10 @@ page {
 }
 
 .layout_f {
+  overflow: auto;
+  height: 1300rpx;
   background: #fff;
-  height: 1278rpx;
+  // height: 1278rpx;
   border-radius: 32rpx 32rpx 16rpx 16rpx;
 
   // .line {
@@ -779,6 +788,122 @@ page {
   bottom: 42rpx;
 }
 
+.clearLayout {
+  background: #FFFFFF;
+  padding: 0 57rpx 45rpx 57rpx;
+  border-radius: 24rpx;
+  margin: 65rpx;
+
+  .title {
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #3E3E3E;
+    text-align: center;
+    margin-top: 42rpx;
+    margin-bottom: 27rpx;
+  }
+
+  .content {
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #9F9F9F;
+
+    text {
+      color: #FF2A00;
+    }
+  }
+
+  .form {
+    .formItem {
+      width: 100%;
+      height: 77rpx;
+      background: #F7F7F7;
+      display: flex;
+      align-items: center;
+      margin-bottom: 30rpx;
+      border-radius: 6px;
+
+      &:first-child {
+
+        margin-top: 30rpx;
+      }
+
+      input {
+        padding-left: 36rpx;
+      }
+    }
+  }
+
+  .exit {
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #9F9F9F;
+    margin-top: 20rpx;
+    text-align: center;
+  }
+}
+
+.payLayout {
+  background: #FFFFFF;
+  position: relative;
+  width: 100%;
+  border-radius: 24rpx 24rpx 0px 0px;
+  padding: 78rpx 30rpx 40rpx 30rpx;
+
+  .payMoney {
+    font-size: 49rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #3E3E3E;
+    text-align: center;
+
+    text {
+      font-size: 83rpx;
+    }
+  }
+
+  .payType {
+    border-radius: 8px;
+    display: flex;
+    justify-content: space-between;
+    // background: red;
+    background: #F7F7F7;
+    align-items: center;
+    padding: 27rpx 46rpx 37rpx 43rpx;
+    margin-top: 40rpx;
+    margin-bottom: 90rpx;
+
+    .payName {
+      display: flex;
+      align-items: center;
+      font-size: 28rpx;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #3E3E3E;
+    }
+  }
+
+  .icon_wxPay {
+    width: 49rpx;
+    height: 45rpx;
+    margin-right: 21rpx;
+  }
+
+  .gou {
+    width: 40rpx;
+    height: 40rpx;
+  }
+
+  .btn_goPay {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
 .shareLayout {
   display: flex;
   flex-direction: column;
@@ -958,15 +1083,15 @@ page {
 
   .recordItem {
     background: #FAFAFA;
-    border-radius: 20px;
+    border-radius: 20rpx;
-    padding: 30rpx;
+    padding: 20rpx;
     display: flex;
     margin-bottom: 20rpx;
 
     .avatar {
       width: 70rpx;
       height: 70rpx;
-      margin-right: 30rpx;
+      margin-right: 20rpx;
     }
 
     .detail {

miniprogram/pages/my/my.ts

@@ -1,7 +1,7 @@
 // pages/my/my.ts
 const app = getApp<IAppOption>()
-import { bindPhoneList } from "../../apis/consumer";
+import { bindPhoneList, phoneChose } from "../../apis/consumer";
-import { info, cleanPhoneDate, labelStatistics } from "../../apis/phone";
+import { info, cleanPhoneDate, labelStatistics, getCleanReturn } from "../../apis/phone";
 import { list } from "../../apis/phone";
 import { sysConfig } from "../../apis/config";
 Page({
@@ -18,7 +18,12 @@ Page({
     dialogSwitchAccount: false,
     dialogCommentRecord: false,
     dialogTagRecord: false,
-    commentRecordList: []
+    commentRecordList: [],
+    visible: false,
+    dialogClear: false,
+    dialogGoPay: false,
+    form_phone: '',
+    form_name: ''
   },
   handleTagRecord() {
     const { checkCondition } = this.data
@@ -156,29 +161,59 @@ Page({
     })
   },
   handleClear() {
-    this.selectComponent('#shadow2').show()
+    // this.selectComponent('#shadow2').show()
+    this.setData({
+      dialogClear: true,
+      form_name: '',
+      form_phone: this.data.userInfo.phone
+    })
   },
   goPay() {
-    wx.navigateTo({
+    // wx.navigateTo({
-      url: `/pages/pay/pay?phone=${this.data.userInfo.phone}`
+    //   url: `/pages/pay/pay?phone=${this.data.userInfo.phone}`
+    // })
+    let userInfo = wx.getStorageSync('userInfo');
+    return new Promise((resolve, reject) => {
+      cleanPhoneDate(this.data.form_phone, this.data.form_name).then((res: any) => {
+        wx.requestPayment({
+          ...res.d,
+          success: (res: any) => {
+            resolve(res)
+            bindPhoneList().then((resp: any) => {
+              wx.showToast({
+                icon: 'none',
+                title: '支付完成'
               })
-    // return new Promise((resolve, reject) => {
+              wx.setStorageSync('userInfo', resp.d.find((consumer: any) => consumer.id === userInfo.id))
-    //   cleanPhoneDate(this.data.userInfo.phone).then((res: any) => {
+            })
-    //     wx.requestPayment({
+            // userInfo.evaluatedTimes = 0
-    //       ...res.d,
+            // wx.setStorageSync('userInfo', userInfo)
-    //       success: (res: any) => {
+            // wx.navigateBack({
-    //         resolve(res)
+            //   delta: 1
-    //       },
-    //       fail: (err: any) => {
-    //         wx.showToast({
-    //           icon: 'none',
-    //           title: '支付失败, 请稍后再试!'
             // })
-    //         reject(err)
+            // this.getInfo()
+            this.setData({
+              dialogClear: false,
+              dialogGoPay: false
+            })
+            getCleanReturn().then(response => {
+              console.log(response);
+              wx.navigateTo({
+                url: `/pages/pay/pay?result=${response.d === 'true'}`
+              })
               // }
-    //     })
+            })
-    //   })
+          },
-    // })
+          fail: (err: any) => {
+            wx.showToast({
+              icon: 'none',
+              title: '支付失败, 请稍后再试!'
+            })
+            reject(err)
+          }
+        })
+      })
+    })
   },
   dialogInviteShow() {
     console.log('dialogInviteShow');
@@ -217,6 +252,7 @@ Page({
       dialogSwitchAccount: false
     })
     wx.setStorageSync("userInfo", accList)
+    phoneChose({ phone: accList.phone })
     this.getInfo()
   },
   goBind() {
@@ -264,6 +300,67 @@ Page({
       })
     })
   },
+  show() {
+    if (!this.data.realName) {
+      this.setData({
+        visible: true
+      })
+    }
+  },
+  close() {
+    this.setData({
+      visible: false
+    })
+  },
+  goChrivc() {
+    wx.navigateToMiniProgram({
+      appId: 'wx1da91ccb94c17c99',
+      path: 'pages/information/information',
+      success(res) {
+        // 打开成功
+      }
+    })
+  },
+  handleConfirmPay() {
+    const { form_name, form_phone } = this.data
+    if (!form_name) {
+      wx.showToast({
+        icon: 'none',
+        title: '请输入您的真实姓名'
+      })
+      return
+    }
+
+    if (!form_phone) {
+      wx.showToast({
+        icon: 'none',
+        title: '请输入您的手机号码'
+      })
+      return
+    }
+
+    if (!/^1[3|4|5|7|8][0-9]{9}$/.test(form_phone)) {
+      wx.showToast({
+        icon: 'none',
+        title: '手机号格式错误!'
+      })
+      return
+    }
+
+    this.setData({
+      dialogGoPay: true,
+    })
+  },
+  handleCloseClear() {
+    this.setData({
+      dialogClear: false
+    })
+  },
+  closeDialogGoPay() {
+    this.setData({
+      dialogGoPay: false
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -377,13 +474,13 @@ Page({
     const promise = new Promise(resolve => {
       setTimeout(() => {
         resolve({
-          title: '您对我的印象评价是什么？',
+          title: '邀请您到【众评】上对我做出印象评价',
           path: `/pages/searchResult/searchResult?phone=${this.data.userInfo.phone}`,
         })
       })
     })
     return {
-      title: '您对我的印象评价是什么？',
+      title: '邀请您到【众评】上对我做出印象评价',
       path: '/pages/login/login',
       promise
     }

miniprogram/pages/my/my.wxml

@@ -1,14 +1,14 @@
 <!--pages/my/my.wxml-->
 <wxs src="../../utils/tools.wxs" module="tools" />
 <view class="searchResult-page">
-  <guide title="查号码"></guide>
+  <guide title="我的主页"></guide>
   <!-- <view style="margin:30rpx 0 0 31rpx">
     <userInfo phone="{{userInfo.phone}}" realName="{{true}}" />
   </view> -->
   <view class="userInfo_box">
     <image class="avatar" src="/assets/images/searchResult/a-ziyuan106@2x.png"></image>
     <view>
-      <view class="username">{{userInfo.phone}}<image class="icon_noCertificate" src="/assets/images/searchResult/{{userInfo.realName?'':'no'}}Certificate.png"></image>
+      <view bindtap="show" class="username">{{userInfo.phone}}<image class="icon_noCertificate" src="/assets/images/searchResult/{{userInfo.realName?'':'no'}}Certificate.png"></image>
       </view>
       <!-- <view class="checkInfo">已有{{consumer.accessTimes}}人次查看，{{consumer.totalSize===0?'暂无人评价':'共获得'+consumer.totalSize+'次评价'}}</view> -->
       <view class="btn_switch" bindtap="showDialogSwitchAccount">
@@ -17,11 +17,24 @@
     </view>
   </view>
 
+  <shadow position="center" wx:if="{{visible}}">
+    <view class="dialog dialog_center" style="height: initial;">
+      <btnClose bindtap="close" />
+      <view class="dialog_title">实名认证</view>
+      <view class="dialog_content">
+        <view class="dialogToLogin">
+          <text>手机号码已完成全国人力资源信息数据验证平台实名认证的用户，将通过“实名认证”标签展示，用户可前往“全国人力资源信息数据验证平台”小程序完成本人实名认证。</text>
+          <btn fontSize="24rpx" width="374rpx" height="64rpx" bindtap="goChrivc">前往认证</btn>
+        </view>
+      </view>
+    </view>
+  </shadow>
+
   <view class="layout_f">
     <view class="scoreLayout">
       <view style="display: flex;align-items: center;justify-content: center;">
         <view class="score" wx:if="{{consumer.totalSize>0}}">{{tools.toFix(consumer.totalAverage)}}</view>
-        <star score="{{consumer.totalAverage}}" starType="cStars" size="34rpx" />
+        <star score="{{consumer.totalAverage}}" starType="stars_half" size="34rpx" />
       </view>
 
       <view class="commentDataBox">
@@ -35,7 +48,7 @@
           邀请好友评价
           <image class="icon_arrow_right" src="/assets/images/searchResult/icon_arrow_right.png"></image>
         </btn>
-        <btn wx:else style="display: flex;align-items: center;justify-content: center;" bindtap="handleComment" type="primary" plain fontSize="24rpx" width="207rpx" height="51rpx" bindtap="handleTagRecord" data-size="{{consumer.totalSize}}">查看详情记录
+        <btn wx:else style="display: flex;align-items: center;justify-content: center;" bindtap="handleComment" type="primary" plain fontSize="24rpx" width="207rpx" height="51rpx" bindtap="handleRecords" data-size="{{consumer.totalSize}}">查看详情记录
           <image class="icon_arrow_right" src="/assets/images/searchResult/icon_arrow_right.png" />
         </btn>
       </view>
@@ -92,7 +105,7 @@
                 <view class="flex spaceBetween" style="width: 100%;">
                   <view class="username">来自匿名用户<image wx:if="{{item.realName}}" class="icon_realName" src="/assets/images/searchResult/icon_rz.png"></image>
                   </view>
-                  <star starType="rStars" score="{{item.score}}" />
+                  <star starType="stars_half" score="{{item.score}}" />
                 </view>
                 <view class="flex spaceBetween" style="width: 100%;align-items: center;">
                   <view class="time">{{tools.dateFormat(now,item.createDate)}}</view>
@@ -153,9 +166,40 @@
     </view>
   </shadow>
 
-  <confirm-box id="shadow2" title="" message="该功能为付费功能，费用{{money}}元。清空后所有的分数和印象标签将清零，是否继续？" confirmText="继续" cancelShow="true" cancelText="取消" bind:close="back" bind:confirm="goPay" />
+  <shadow position="center" wx:if="{{dialogClear}}">
+    <view class="clearLayout">
+      <view class="title">清空所有评价数据</view>
+      <view class="content">为确保操作为用户本人，您需要进行一次实名认证，费用<text>￥{{money}}</text>。清空后所有的分数和印象标签将清零。</view>
+      <view class="form">
+        <view class="formItem">
+          <input type="text" placeholder="真实姓名" model:value="{{form_name}}"/>
+        </view>
+        <view class="formItem">
+          <input type="text" placeholder="手机号码" model:value="{{form_phone}}" disabled="true"/>
+        </view>
+      </view>
+      <btn width="100%" height="80rpx" fontSize="28rpx" bindtap="handleConfirmPay">提交认证，确认支付</btn>
+      <view class="exit" bindtap="handleCloseClear">退出</view>
+    </view>
+  </shadow>
 
-  <dialog visible="{{dialogInvite}}" position="my" bind:close="closeInvite" />
+  <shadow position="bottom" wx:if="{{dialogGoPay}}">
+    <view class="payLayout">
+      <btnClose bindtap="closeDialogGoPay"/>
+      <view class="payMoney">￥<text>{{money}}</text></view>
+      <view class="payType">
+        <view class="payName">
+          <image class="icon_wxPay" src="/assets/images/pay/icon_wxPay.png"></image>微信支付
+        </view>
+        <image class="gou" src="/assets/images/pay/gougou@2x.png"></image>
+      </view>
+      <view class="btn_goPay">
+        <btn height="80rpx" width="505rpx" fontSize="28rpx" bindtap="goPay">确认支付</btn>
+      </view>
+    </view>
+  </shadow>
+
+  <dialog visible="{{dialogInvite}}" position="my" isSelf="true" bind:close="closeInvite" />
 
   <shadow position="center" wx:if="{{dialogShare}}">
     <view class="shareLayout">

miniprogram/pages/pay/pay.scss

@@ -70,3 +70,34 @@
   display: flex;
   justify-content: center;
 }
+
+.page-payResult {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding-top: 172rpx;
+
+  .icon_result {
+    width: 161rpx;
+    height: 208rpx;
+  }
+
+  .title {
+    font-size: 36rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #3E3E3E;
+    text-align: center;
+    margin-top: 26rpx;
+  }
+
+  .context {
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #A1A1A1;
+    margin-top: 23rpx;
+    margin-bottom: 36rpx;
+  }
+}

miniprogram/pages/pay/pay.ts

@@ -20,8 +20,8 @@ Page({
             resolve(res)
             bindPhoneList().then((resp: any) => {
               wx.showToast({
-                icon:'none',
+                icon: 'none',
-                title:'支付完成'
+                title: '支付完成'
               })
               wx.setStorageSync('userInfo', resp.d.find((consumer: any) => consumer.id === userInfo.id))
             })
@@ -42,13 +42,21 @@ Page({
       })
     })
   },
+  goMy() {
+    wx.redirectTo({
+      url: '/pages/my/my'
+    })
+  },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    console.log(options);
+
     this.setData({
-      phone: options.phone
+      // phone: options.phone
+      result: options.result
     })
   },
 

miniprogram/pages/pay/pay.wxml

@@ -1,6 +1,6 @@
 <!--pages/pay/pay.wxml-->
 <wxs src="../../utils/tools.wxs" module="tools" />
-<view class="page-pay">
+<!-- <view class="page-pay">
   <view class="money">￥<text>{{tools.toFix(money,2)}}</text></view>
   <view class="payInfo">清空所有评价信息费用支付</view>
   <view class="payLayout">
@@ -13,4 +13,10 @@
   <view class="btn_bottom">
     <btn width="518rpx" height="88rpx" fontSize="34rpx" bindtap="goPay">立即支付</btn>
   </view>
+</view> -->
+<view class="page-payResult">
+  <image class="icon_result" src="/assets/images/pay/icon_{{result==='true'?'success':'faild'}}.png"></image>
+  <view class="title">{{result==='true'?'操作成功！':'操作失败！'}}</view>
+  <view class="context">{{result==='true'?'您的评价数据已经全部清空':'您的实名认证信息有误，请重新填写'}}</view>
+  <btn bindtap="goMy" type="member" plain fontSize="32rpx" width="303rpx" height="78rpx">回我的主页</btn>
 </view>

miniprogram/pages/report/report.json

@@ -4,6 +4,7 @@
   "usingComponents": {
     "btn": "/components/btn/btn",
     "not": "/components/not/not",
-    "navBar":"/components/navBar/navBar"
+    "navBar":"/components/navBar/navBar",
+    "filter": "/components/filter/filter"
   }
 }

miniprogram/pages/report/report.wxml

@@ -22,7 +22,7 @@
       <view class="middle">
         <view class="mItem">
           <view class="label">生成时间：</view>
-          <view class="text">2022-05-18 11:20</view>
+          <view class="text"><filter type="parseTime" value="{{item.reportCreateDate}}" params="{{['{y}-{m}-{d} {h}:{i}']}}" /></view>
         </view>
         <view class="mItem">
           <view class="label">报告备注：</view>

miniprogram/pages/searchResult/searchResult.scss

@@ -3,7 +3,13 @@ page {
   // background: #7E8BFF;
   background: url('https://chrivc.obs.cn-north-4.myhuaweicloud.com/3fde540348f34b58afa6763a4a3d76b8:b9d570d9205696a5034b961fb962184093024b006b1ac-FWgr.png');
   background-size: cover;
-  background-position: 92% 100%;
+  background-position: 100%;
+}
+
+.overflowBox {
+  // background: url('https://chrivc.obs.cn-north-4.myhuaweicloud.com/3fde540348f34b58afa6763a4a3d76b8:b9d570d9205696a5034b961fb962184093024b006b1ac-FWgr.png');
+  // background-size: cover;
+  // background-position: 92% 100%;
 }
 
 .page-overflow-hidden {
@@ -15,7 +21,11 @@ page {
 .searchResult-page {
   // background: #7E8BFF;
   // margin-top: 150rpx;
-  padding: 30rpx 30rpx;
+  // padding: 30rpx 30rpx;
+  padding: 30rpx 30rpx 0 30rpx;
+  // background: url('https://chrivc.obs.cn-north-4.myhuaweicloud.com/3fde540348f34b58afa6763a4a3d76b8:b9d570d9205696a5034b961fb962184093024b006b1ac-FWgr.png');
+  // background-size: cover;
+  // background-position: 92% 100%;
 
 
   // .userInfo_box {
@@ -97,6 +107,7 @@ page {
   .layout_top {
     display: flex;
     justify-content: space-between;
+    margin-bottom: 20rpx;
 
 
     .layout_title {
@@ -104,7 +115,7 @@ page {
       font-family: PingFang SC;
       font-weight: bold;
       color: #4F536B;
-      margin-bottom: 20rpx;
+      // margin-bottom: 20rpx;
     }
 
     .layout_operation {
@@ -233,14 +244,15 @@ page {
 
 .btn_operation {
   display: flex;
-  position: absolute;
+  // position: relative;
-  bottom: 42rpx;
+  position: fixed;
+  bottom: 50rpx;
 
   .btn_share {
-    background: none;
+    background: #7B8EFF;
     border-radius: 44rpx;
     border: 1px solid #fff;
-    width: 199rpx;
+    width: 204rpx;
     height: 88rpx;
     font-size: 34rpx;
     font-family: PingFang SC;
@@ -372,15 +384,15 @@ page {
 
   .recordItem {
     background: #FAFAFA;
-    border-radius: 20px;
+    border-radius: 20rpx;
-    padding: 30rpx;
+    padding: 20rpx;
     display: flex;
     margin-bottom: 20rpx;
 
     .avatar {
       width: 70rpx;
       height: 70rpx;
-      margin-right: 30rpx;
+      margin-right: 20rpx;
     }
 
     .detail {
@@ -476,6 +488,7 @@ page {
     padding-bottom: 18rpx;
     padding-top: 28rpx;
     border-bottom: 1px solid rgba(210, 210, 210, .27);
+    width: 100%;
 
     &:first-child {
       padding-top: 10rpx;
@@ -775,3 +788,7 @@ page {
     }
   }
 }
+
+.zhanwei {
+  height: 150rpx;
+}

miniprogram/pages/searchResult/searchResult.ts

@@ -19,7 +19,7 @@ Page({
     consumer: {},
     listQuery: {
       current: 1,
-      size: 10,
+      size: 99999,
       phone: undefined
     },
     userInfo: app.globalData.userInfo,
@@ -71,9 +71,19 @@ Page({
   },
   handleComment() {
     let { consumer, tagListOrigin, } = this.data
-    let row = consumer.evaluateLabelIds?consumer.evaluateLabelIds.split(','):[]
+
+
+    let row = consumer.evaluateLabelIds ? consumer.evaluateLabelIds.split(',') : []
     // console.log(row);
 
+    if (!consumer.evaluateLabelIds) {
+      tagListOrigin.map((item: any) => {
+        item.map((itm: any) => {
+          itm.checked = false
+        })
+      })
+    }
+
     let tagList = <any>[]
     tagListOrigin.map((o: any) => {
       o.map((g: any) => {
@@ -146,7 +156,11 @@ Page({
     })
   },
   getSysConfig() {
+    console.log('getSysConfig');
+
     sysConfig().then(res => {
+      console.log('###');
+      console.log(res);
       this.setData({
         checkCondition: res.d.checkCondition
       })
@@ -207,7 +221,15 @@ Page({
   },
 
   getInfo() {
+    console.log('getInfo');
+    console.log('Authorization', wx.getStorageSync('Authorization'));
+    console.log('global', app.globalData);
+
+
     info({ phone: this.data.phone, type: 1 }).then(res => {
+      console.log('###getInfo');
+      console.log(res);
+
       this.setData({
         consumer: res.d,
       })
@@ -217,18 +239,23 @@ Page({
         })
       }
     })
+    console.log('getInfo-end');
+
   },
   getCommentRecords() {
+    console.log('getCommentRecords');
+
     let payload = {
       ...this.data.listQuery,
       phone: this.data.phone
     }
     list(payload).then(res => {
-      console.log(res);
+      // console.log(res);
       this.setData({
         commentRecordList: res.d.records
       })
     })
+    console.log('getCommentRecords-end');
   },
   getTagList() {
     console.log('getTagList');
@@ -319,7 +346,8 @@ Page({
 
 
     tagList({ current: 1, size: 99999 }).then(res => {
-      // console.log(res);
+      console.log('###2');
+      console.log(res);
       tagListOrigin = res.d
       let arr = []
       Object.keys(res.d).forEach(key => {
@@ -327,21 +355,22 @@ Page({
         res.d[key].map(item => item.checked = false)
         arr.push(res.d[key])
       })
-      // console.log(arr);
-
-      // tagListOrigin.map(item => item.checked = false)
-      // console.log('tagListOrigin', tagListOrigin1);
 
       this.setData({
         tagListOrigin: arr
       })
     })
+    console.log('tagListOrigin1n-end');
   },
   getEtcData() {
+    console.log('getEtcData-start');
+
     etcData(this.data.phone).then(res => {
       console.log(res);
 
     })
+    console.log('getEtcData-end');
+
   },
   handleScore(e) {
     const { score } = e.detail
@@ -437,17 +466,22 @@ Page({
     this.setData({
       phone: options.phone
     })
+    if (app.globalData.openId) {
       this.getInfo()
+      this.getSysConfig()
+      this.getTagListOrigin()
+    }
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-    this.getTagListOrigin()
+
     this.setData({
       now: Math.floor(new Date().getTime() / 1000)
     })
+
   },
 
   /**
@@ -459,7 +493,7 @@ Page({
       userInfo: wx.getStorageSync('userInfo'),
       accountList: wx.getStorageSync("accountList")
     })
-    this.getSysConfig()
+
     // this.getBindPhoneList()
 
   },

miniprogram/pages/searchResult/searchResult.wxml

@@ -1,9 +1,11 @@
 <!--pages/searchResult/searchResult.wxml-->
 <wxs src="../../utils/tools.wxs" module="tools" />
 <view class="searchResult-page {{popup?'page-overflow-hidden':''}}">
-  <guide realName="{{accountList.length>0}}"></guide>
+  <guide title="查号码" realName="{{accountList.length>0}}"></guide>
   <userInfo phone="{{phone}}" realName="{{consumer.realName}}" />
+  <view class="zhanwei"></view>
 
+  <view class="overflowBox">
     <view wx:if="{{!consumer.evaluatedScore}}" class="noRatingValue">分数已隐藏</view>
     <view wx:elif="{{!consumer.totalSize>0}}" class="noRatingValue">暂无评价</view>
     <view wx:else class="ratingValue">{{tools.toFix(consumer.totalAverage)}}</view>
@@ -12,20 +14,12 @@
       <star score="{{consumer.totalAverage}}" starKey="t" />
     </view>
 
-  <!-- <view wx:if="{{consumer.totalSize>0}}" class="commentCount">其中实名认证用户 <text class="specNum">{{consumer.realNameSize}}</text>次，实名认证用户平均评价 <text class="specNum">{{tools.toFix(consumer.realNameAverage)}}</text></view>
-  <view wx:elif="{{!consumer.totalAverage}}"></view>
-  <view wx:else class="noCommentCount">对方暂未收到任何评价信息，快来评价一下吧~</view> -->
-
-  <!-- <view class="align_center" wx:if="{{consumer.totalSize>0}}">
-    <btn type="default" width="156rpx" height="49rpx" fontSize="24rpx" style="margin-top:30rpx;" bindtap="handleCommentRecord">详情记录></btn>
-  </view> -->
-  
     <view class="commentDataBox">
       <view class="date">
         <filter wx:if="{{consumer.firstEvaluateTime}}" type="parseTime" value="{{consumer.firstEvaluateTime}}" params="{{['{y}年{m}月{d}日']}}" />至今：
       </view>
-    <view class="unRealName">已有{{consumer.accessTimes}}人次查看，共获得{{consumer.totalSize}}次评价</view>
+      <view class="unRealName">已有 {{consumer.accessTimes}} 人次查看，共获得 {{consumer.totalSize}} 次评价</view>
-    <view class="realName">其中实名认证用户 <text>{{consumer.evaluatedScore?consumer.realNameSize:'***'}}</text> 次 实名认证用户平均评价 <text>{{consumer.evaluatedScore?tools.toFix(consumer.realNameAverage):'**'}}</text></view>
+      <view class="realName">其中实名认证用户 <text>{{consumer.realNameSize}}</text> 次 实名认证用户平均评价 <text>{{consumer.evaluatedScore?tools.toFix(consumer.realNameAverage):'**'}}</text></view>
       <btn wx:if="{{!consumer.evaluatedScore}}" type="info" plain width="271rpx" height="49rpx" style="display: flex;align-items: center;justify-content: center;margin-top:12rpx" bindtap="handleComment">评价对方可查看分数</btn>
       <view wx:elif="{{consumer.evaluatedScore!==null}}" class="detailText" bindtap="handleCommentRecord">详情记录></view>
       <btn wx:else type="default" width="156rpx" height="49rpx" fontSize="24rpx" style="margin-top:30rpx;" bindtap="handleCommentRecord">查看详情记录></btn>
@@ -34,23 +28,31 @@
       <view class="layout">
         <view class="layout_top">
           <view class="layout_title">印象标签</view>
-        <view wx:if="{{consumer.labelVoList}}" class="layout_operation" bindtap="handleTagRecord">查看所有印象标签
+          <view wx:if="{{consumer.labelVoList&&consumer.evaluatedScore}}" class="layout_operation" bindtap="handleTagRecord">查看所有印象标签
             <image class="icon_arrow_right" src="/assets/images/searchResult/icon_arrow_right.png"></image>
           </view>
         </view>
         <view class="noTag" wx:if="{{!consumer.labelVoList}}">暂未收到任何印象标签</view>
         <view class="tagList" wx:else>
+          <block wx:if="{{!consumer.evaluatedScore}}">
+            
+          </block>
+          <block wx:else>
             <view plain class="tagItem " wx:for="{{consumer.labelVoList}}">
               <text class="{{index>0?'filter_blur':''}}">{{item.content}}</text>
               <view class="numTag">x{{item.contentCount}}</view>
             </view>
+          </block>
+
         </view>
+        <!-- !consumer.evaluatedScore -->
         <view class="count" wx:if="{{consumer.labelVoList}}">
-        共收到{{consumer.labelCount}}条印象标签，其中“{{consumer.labelVoList[0].content}}”获得了{{consumer.labelVoList[0].contentCount}}次点击
+          <!-- 共收到{{consumer.labelCount}}条印象标签，其中“{{consumer.labelVoList[0].content}}”获得了{{consumer.labelVoList[0].contentCount}}次点击 -->
+          共收到{{consumer.labelCount}}条印象标签{{!consumer.evaluatedScore?'':'，其中“'+consumer.labelVoList[0].content+'”获得了'+consumer.labelVoList[0].contentCount+'次点击'}}
         </view>
       </view>
 
-    <view class="layout">
+      <view class="layout" style="margin-bottom: 140rpx;">
         <view class="layout_top">
           <view class="layout_title">全国人力资源信息数据验证平台个人信息报告</view>
         </view>
@@ -74,12 +76,17 @@
           <btn wx:elif="{{consumer.electronicCertificateId===null}}" type="member" plain width="207rpx" height="51rpx" bindtap="showDialogInvite">邀请授权报告
             <image class="icon_arrow_right" src="/assets/images/searchResult/icon_arrow_right.png"></image>
           </btn>
+          <btn wx:elif="{{!consumer.evaluatedScore}}" type="member" plain width="250rpx" height="51rpx" bindtap="handleComment">评价对方可查看报告
+            <!-- <image class="icon_arrow_right" src="/assets/images/searchResult/icon_arrow_right.png"></image> -->
+          </btn>
           <btn wx:else type="member" plain width="207rpx" height="51rpx" bindtap="goReport" data-id="{{consumer.electronicCertificateId}}">立即查看
             <image class="icon_arrow_right" src="/assets/images/searchResult/icon_arrow_right.png"></image>
           </btn>
         </view>
       </view>
-
+    </view>
+  </view>
+  <view class="zhanwei"></view>
   <view class="btn_operation">
     <button class="btn_share" open-type="share">
       <image src="/assets/images/searchResult/fenxiang@2x.png"></image>分享
@@ -95,7 +102,7 @@
       <image src="/assets/images/searchResult/dianping@2x.png"></image>{{consumer.evaluatedScore===null?'我要评价':'修改/更新评价'}}
     </view>
   </view>
-  </view>
+
   <!-- 评价提交 -->
   <shadow position="bottom" wx:if="{{dialogComment}}">
     <view class="dialog" style="max-height: 90%;">
@@ -104,14 +111,14 @@
       <view class="dialog_subTitle" wx:if="{{!consumer.evaluatedScore}}">评价对方后，即可查看对方众评数据</view>
       <star score="{{form.score}}" starKey="c" starType="cStars" bind:setScore="handleScore" />
       <view class="cStarScore">{{form.score}}</view>
-      <view class="dialog_content" style="overflow: auto;height: 700rpx;">
+      <view class="dialog_content" style="overflow: auto;height: 500rpx;">
         <view class="dialog_comment">
           <view class="choosed">
             <view class="label">印象标签：</view>
             <view class="c_tagList">
               <view class="c_tagItem tagActive" wx:for="{{tagList}}" wx:key="id" bindtap="deleteTag" data-id="{{item.id}}" data-item="{{item}}">
                 {{item.content}}
-                <view class="deleteTag" >x</view>
+                <view class="deleteTag">x</view>
               </view>
             </view>
           </view>
@@ -131,7 +138,7 @@
       <view class="align_center">
         <btn fontSize="34rpx" style="margin-bottom:20rpx;margin-top: 20rpx;" width="501rpx" height="88rpx" bindtap="submitComment">提交</btn>
       </view>
-      <view class="align_center">
+      <view class="align_center" wx:if="{{!consumer.evaluatedScore}}">
         <btn type="member" style="margin-bottom:20rpx" plain fontSize="34rpx" width="501rpx" height="88rpx" bindtap="submitAvgComment">不太了解，先评价一般</btn>
       </view>
       <view class="tip">提示：提交后可再次修改更新评价</view>
@@ -151,7 +158,7 @@
                 <view class="flex spaceBetween">
                   <view class="username">来自匿名用户<image wx:if="{{item.realName}}" class="icon_realName" src="/assets/images/searchResult/icon_rz.png"></image>
                   </view>
-                  <star starType="rStars" score="{{item.score}}" />
+                  <star starType="stars_half" score="{{item.score}}" />
                 </view>
                 <view class="flex spaceBetween">
                   <view class="time">{{tools.dateFormat(now,item.createDate)}}</view>

miniprogram/utils/request.ts

@@ -1,6 +1,6 @@
 // export const baseUrl = 'https://www.chrivc.com/api';
-export const baseUrl = 'https://app.pc.seemore.club';
+// export const baseUrl = 'https://app.pc.seemore.club';
-// export const baseUrl = 'http://office.xianci.info:19092';
+export const baseUrl = 'http://office.xianci.info:19092';
 // export const baseUrl = 'http://192.168.168.189:9090';
 // export const baseUrl = 'http://120.77.82.246:18085';
 // export const baseUrl = 'http://192.168.168.234:18085';

project.private.config.json

@@ -14,6 +14,31 @@
           "query": "id=1553205783638884354&type=2&active=3",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/searchResult/searchResult",
+          "query": "phone=13408085719",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/searchResult/searchResult",
+          "query": "phone=13408085719",
+          "launchMode": "default",
+          "scene": null,
+          "partialCompile": {
+            "enabled": true,
+            "pages": []
+          }
+        },
+        {
+          "name": "",
+          "pathName": "pages/pay/pay",
+          "query": "result=false",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }