优化权益人手机号功能

miniprogram/config.ts

@@ -1,4 +1,4 @@
-const environmentVariable = "online";
+const environmentVariable = "test";
 const apiUrlInfo = {
   dev: "https://dev.kt.colexiu.com",
   test: "https://test.kt.colexiu.com",

miniprogram/pages/index/index.less

@@ -990,4 +990,11 @@ page {
     text-align: center;
     padding-top: 18px;
   }
+}
+
+.addPhone {
+  margin: 24rpx 40rpx 24rpx;
+  border: 1px solid #F6F6F6;
+  border-radius: 20rpx;
+  overflow: hidden;
 }

miniprogram/pages/index/index.ts

@@ -124,6 +124,7 @@ Page({
       value: '0',
       className: 'two-gender cancel-gender'
     }],
+    userNote: '', // 存储用户手机号
     userBeneficiaryId: '', // 选中用户的编号
     userBeneficiaryInfo: {
       name: '',
@@ -423,10 +424,17 @@ Page({
   onSubmit() {
     // 判断是否登录
     const that = this
-    if (!this.data.userBeneficiaryId) {
+    // if (!this.data.userBeneficiaryId) {
+    //   wx.showToast({
+    //     title: '请填写享用者的个人信息',
+    //     icon: 'none'
+    //   })
+    //   return
+    // }
+    if (!this.data.userNote || !/^1[3456789]\d{9}$/.test(this.data.userNote)) {
       wx.showToast({
-        title: '请填写享用者的个人信息',
-        icon: 'none'
+        title: '请输入正确的手机号',
+        icon: "none"
       })
       return
     }
@@ -470,7 +478,8 @@ Page({
       info = encodeURIComponent(info);
 
       wx.navigateTo({
-        url: `../orders/order-detail?orderInfo=${info}&userBeneficiaryId=${that.data.userBeneficiaryId}`,
+        // url: `../orders/order-detail?orderInfo=${info}&userBeneficiaryId=${that.data.userBeneficiaryId}`,
+        url: `../orders/order-detail?orderInfo=${info}&userNote=${that.data.userNote}`,
         success: () => {
           that.setData({
             popupShow: false

miniprogram/pages/index/index.wxml

@@ -105,8 +105,12 @@
       <!-- <view class="popup-container"> -->
       <view class="popup-scroll">
         <image src="https://oss.dayaedu.com/ktyq/01/1767886728137.png" mode="widthFix" class="top-vip-img"></image>
+        <!-- 添加手机号 -->
+        <view class="addPhone">
+          <van-field border="{{false}}" model:value="{{ userNote }}" maxlength="11" type="number" placeholder="请输入权益人手机号" />
+        </view>
         <!-- 添加权益人 -->
-        <view class="addBuyer" bind:tap="onSelectBuyer">
+        <!-- <view class="addBuyer" bind:tap="onSelectBuyer">
           <view class="addBuyer-left">
             <image src="./images/icon-man.png" class="icon-man"></image>
             <view class="info" wx:if="{{ userBeneficiaryId }}">
@@ -123,7 +127,7 @@
             </view>
           </view>
           <image src="./images/icon-arrow-right.png" class="arrow-right"></image>
-        </view>
+        </view> -->
 
         <view class="goodsInfo">
           <view class="desc">会员有效期</view>

miniprogram/pages/orders/order-detail.ts

@@ -30,6 +30,7 @@ Page({
       phoneNumber: ''
     },
     userBeneficiaryId: '', // 添加购买人信息
+    userNote: '', // 购买人手机号
     userBeneficiaryInfo: {
       name: '',
       phoneNumber: '',
@@ -124,6 +125,7 @@ Page({
       this.setData({
         goodsInfo: infos,
         userBeneficiaryId: options.userBeneficiaryId,
+        userNote: options.userNote,
         status: options.status || '',
         hasInstrument
       }, () => {
@@ -151,6 +153,7 @@ Page({
           phoneNumber: addresses?.phoneNumber
         },
         userBeneficiaryId: beneficiary.schoolAreaId, // 添加购买人信息
+        userNote: beneficiary.userNote, // 添加购买人手机号
         userBeneficiaryInfo: {
           name: beneficiary.name,
           phoneNumber: beneficiary.phone,
@@ -260,7 +263,8 @@ Page({
           openId: app.globalData.userInfo?.liteOpenid,
           goodsInfos: goodsInfos,
           receiveAddress: this.data.receiveAddress,
-          userBeneficiaryId: this.data.userBeneficiaryId,
+          // userBeneficiaryId: this.data.userBeneficiaryId,
+          userNote: this.data.userNote,
           orderName: name,
           orderDesc: name
         })