会员手机号逻辑调整

miniprogram/api/login.ts

@@ -47,6 +47,13 @@ export const api_executeOrder = (params: any) => {
     data: params,
   } as any);
 };
+export const api_executeOrderV2 = (params: any) => {
+  return request({
+    url: `/edu-app/userPaymentOrder/miniProgramExecuteOrderV2`,
+    method: "post",
+    data: params,
+  } as any);
+};
 
 /** 用户下单 */
 export const api_executePayment = (params: any) => {

miniprogram/pages/index/index.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "service": "/components/service/service",
-    "numberDisplay": "/components/numberDisplay/numberDisplay"
+    "numberDisplay": "/components/numberDisplay/numberDisplay",
+    "van-field": "@vant/weapp/field/index"
   }
 }

miniprogram/pages/index/index.less

@@ -349,6 +349,14 @@ page {
           }
         }
       }
+
+      .addPhone {
+        // margin: 24rpx 40rpx 24rpx;
+        border: 1px solid #F6F6F6;
+        border-radius: 20rpx;
+        overflow: hidden;
+        // background-color: #fff;
+      }
     }
     .btnSections {
       margin-top: 20rpx;

miniprogram/pages/index/index.ts

@@ -28,6 +28,8 @@ Page({
     isShowMemberInfoTip: false, // 会员信息提示
     isFromPreviewImage: false,
     isShowOperation: false, // 是否显示操作按钮
+
+    userNote: '', // 会员手机号
   },
 
   /**
@@ -169,30 +171,45 @@ Page({
       if (!that.isLogin()) {
         return
       }
-      if (!that.data.memberInfo.id) {
+      if (!that.data.userNote || !/^1[3456789]\d{9}$/.test(that.data.userNote)) {
         wx.showToast({
-          title: "请填写会员信息",
-          icon: 'none'
+          title: '请输入正确的手机号',
+          icon: "none"
         })
         that.setData({
           isShowMemberInfoTip: true
         })
         return
+      } else {
+        that.setData({
+          isShowMemberInfoTip: false
+        })
       }
+      // if (!that.data.memberInfo.id) {
+      //   wx.showToast({
+      //     title: "请填写会员信息",
+      //     icon: 'none'
+      //   })
+      //   that.setData({
+      //     isShowMemberInfoTip: true
+      //   })
+      //   return
+      // }
       let info = JSON.stringify({
         ...that.data.selected
       });
       let instrumentsInfo = JSON.stringify({
         ...that.data.selectedInstruments
       })
-      let memberInfo = JSON.stringify({
-        ...that.data.memberInfo
-      })
+      // let memberInfo = JSON.stringify({
+      //   ...that.data.memberInfo
+      // })
       info = encodeURIComponent(info);
       instrumentsInfo = encodeURIComponent(instrumentsInfo);
-      memberInfo = encodeURIComponent(memberInfo);
+      // memberInfo = encodeURIComponent(memberInfo);
+      // memberInfo=${memberInfo}
       wx.navigateTo({
-        url: `../orders/order-detail?orderInfo=${info}&instrumentsInfo=${instrumentsInfo}&memberInfo=${memberInfo}`,
+        url: `../orders/order-detail?orderInfo=${info}&instrumentsInfo=${instrumentsInfo}&userNote=${that.data.userNote}`,
         success: () => {
         }
       })

miniprogram/pages/index/index.wxml

@@ -25,7 +25,7 @@
       </view>
     </view>
 
-    <view class="popup-section" wx:if="{{popupShow}}">
+    <view class="popup-section" wx:if="{{popupShow}}">b
       <view class="popup-mask" bind:tap="onClose"></view>
       <view class="popup-container">
         <view bind:tap="onClose" class="iconClose"></view>
@@ -50,7 +50,12 @@
           </view>
         </view>
         <view class="memberBox {{isShowMemberInfoTip?'showMemberInfoTip':''}}">
-          <view wx:if="{{ !memberInfo.id }}" class="memberCon" bind:tap="onMemberInfo">
+          <view class="addPhone">
+            <van-field style="width: 100%" border="{{false}}" model:value="{{ userNote }}" maxlength="11" type="number" placeholder="请输入会员手机号" >
+              <view class="required" slot="label">手机号码</view>
+            </van-field>
+        </view>
+          <!-- <view wx:if="{{ !memberInfo.id }}" class="memberCon" bind:tap="onMemberInfo">
             <image class="memberImg" src="./images/member.png"></image>
             <text class="info">请填写会员信息</text>
             <image class="chevronImg" src="./images/chevron.png"></image>
@@ -67,7 +72,7 @@
               </view>
             </view>
             <image class="chevronImg" src="./images/chevron.png"></image>
-          </view>
+          </view> -->
         </view>
         <view class="goodsInfo">
           <view class="desc"><text>*</text>会员卡类型</view>

miniprogram/pages/orders/order-detail.ts

@@ -1,5 +1,5 @@
 // pages/orders/order-detail.ts
-import { api_executeOrder, api_executePayment, api_queryByParamName, api_userPaymentOrderUnpaid, api_getUserReceiveAddressPage } from "../../api/login";
+import { api_executeOrderV2, api_executePayment, api_queryByParamName, api_userPaymentOrderUnpaid, api_getUserReceiveAddressPage } from "../../api/login";
 
 // 获取应用实例
 const app = getApp<IAppOption>()
@@ -23,6 +23,7 @@ Page({
     goodsInfo: {} as any,
     instrumentsInfo: {} as any,
     memberInfo: {} as any,
+    userNote: '', // 会员手机号
     paymentType: null as any, // 支付类型
     paymentChannel: null as any,
   },
@@ -35,12 +36,13 @@ Page({
     if (options.orderInfo) {
       const goods = JSON.parse(decodeURIComponent(options.orderInfo));
       const instrumentsInfo = JSON.parse(decodeURIComponent(options.instrumentsInfo));
-      const memberInfo = JSON.parse(decodeURIComponent(options.memberInfo));
-      console.log(goods, 'goods', instrumentsInfo, memberInfo)
+      // const memberInfo = JSON.parse(decodeURIComponent(options.memberInfo));
+
+      // console.log(goods, 'goods', instrumentsInfo, memberInfo)
       this.setData({
         goodsInfo: goods,
         instrumentsInfo,
-        memberInfo,
+        userNote: options.userNote,
         status: goods.status
       });
     }
@@ -163,7 +165,7 @@ Page({
             "paymentCouponAmount": 0
           })
         }
-        const { data } = await api_executeOrder({
+        const { data } = await api_executeOrderV2({
           "orderType": "WECHAT_MINI",
           "paymentType": this.data.paymentType,
           "paymentCashAmount": salePrice + (this.data.instrumentsInfo.salePrice || 0),
@@ -174,7 +176,8 @@ Page({
           "orderName": name + (this.data.instrumentsInfo.name ? `+${this.data.instrumentsInfo.name}` : ""),
           "orderDesc": name + (this.data.instrumentsInfo.name ? `+${this.data.instrumentsInfo.name}` : ""),
           "receiveAddress": this.data.addressInfo.id || "",
-          "userBeneficiaryId": this.data.memberInfo.id
+          userNote: this.data.userNote
+          // "userBeneficiaryId": this.data.memberInfo.id
         })
         if (data.code === 200) {
           const { paymentConfig, paymentType, orderNo } = data.data

miniprogram/pages/orders/order-detail.wxml

@@ -83,7 +83,7 @@
           <numberDisplay number="{{ goodsInfo.salePrice + (instrumentsInfo.salePrice || 0) }}" />
         </view>
       </view>
-      <view class="order-content">
+      <!-- <view class="order-content">
         <view class="titTip">会员信息</view>
         <view class="memberInfo">
           <text>姓名</text>
@@ -97,7 +97,7 @@
           <text>学校信息</text>
           <text>{{ memberInfo.schoolInfo }}</text>
         </view>
-      </view>
+      </view> -->
 
       <!-- <view class="order-time">
       <view class="order-item">

miniprogram/pages/orders/order-result.wxml

@@ -77,7 +77,7 @@
         <numberDisplay number="{{ goodsInfo.salePrice + (instrumentsInfo.salePrice || 0) }}" />
       </view>
     </view>
-    <view class="order-content">
+    <!-- <view class="order-content">
       <view class="titTip">会员信息</view>
       <view class="memberInfo">
         <text>姓名</text>
@@ -91,7 +91,7 @@
         <text>学校信息</text>
         <text>{{ memberInfo.schoolInfo }}</text>
       </view>
-    </view>
+    </view> -->
     <view class="order-content">
       <view class="titTip">订单信息</view>
       <view class="memberInfo">