黄琪勇 пре 4 месеци
родитељ
комит
9228e1c85c

+ 1 - 1
miniprogram/config.ts

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

+ 8 - 0
miniprogram/pages/address/addAddress.less

@@ -51,11 +51,19 @@
         .fromIpt {
           margin-left: 20rpx;
           flex-grow: 1;
+          .index--van-cell{
+            padding-right: 0;
+          }
+          .index--van-cell__right-icon-wrap {
+            margin-right: -6rpx !important;
+            color: #cccccc !important;
+          }
           .van-field {
             padding: 0;
             --cell-line-height: 80rpx;
 
             .van-cell__right-icon {
+              margin-right: -6rpx;
               color: #cccccc;
             }
           }

+ 4 - 8
miniprogram/pages/address/addAddress.ts

@@ -227,10 +227,6 @@ Component({
             defaultStatus: false,
             postCode: "",
           })
-          wx.showToast({
-            title: '保存成功',
-            icon: 'none'
-          })
         } else {
           const { data } = await api_userReceiveAddressSave({
             phoneNumber: params.phoneNumber,
@@ -243,12 +239,12 @@ Component({
             postCode: "",
           })
           id = data.data
-          wx.showToast({
-            title: '保存成功',
-            icon: 'none'
-          })
         }
         wx.hideLoading()
+        wx.showToast({
+          title: '保存成功',
+          icon: 'none'
+        })
         this.triggerEvent('addAddress', { addressInfo: { id, name: params.name, phoneNumber: params.phoneNumber, addressDes: params.provinceName + params.cityName + (params.regionName || "") + params.detailAddress } }, {})
         this.onDialogClose()
       } catch {

+ 1 - 1
miniprogram/pages/address/addAddress.wxml

@@ -25,7 +25,7 @@
       <view class="fromCon">
         <text class="fromTit">详细地址</text>
         <view class="fromIpt">
-          <van-field maxlength="100" autosize type="textarea" model:value="{{ detailAddress }}" input-align="right" placeholder="请填写街道、小区、门牌号等信息" border="{{ false }}" />
+          <van-field maxlength="100" autosize="{{ { maxHeight: 50} }}" type="textarea" model:value="{{ detailAddress }}" input-align="right" placeholder="请填写街道、小区、门牌号等信息" border="{{ false }}" />
         </view>
       </view>
     </view>

+ 21 - 0
miniprogram/pages/address/addressList.less

@@ -89,6 +89,7 @@
           font-size: 24rpx;
           color: #777777;
           line-height: 32rpx;
+          word-break: break-all;
         }
       }
 
@@ -136,6 +137,26 @@
         }
       }
     }
+    .empty-box {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -70%);
+    
+      image {
+        width: 375rpx;
+        height: 250rpx;
+      }
+    
+      .empty-text {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #AAAAAA;
+        line-height: 40rpx;
+        text-align: center;
+        padding-top: -24rpx;
+      }
+    }
   }
 
   .submitCon {

+ 24 - 18
miniprogram/pages/address/addressList.wxml

@@ -3,29 +3,35 @@
     <navigation-bar title="选择收货信息"></navigation-bar>
     <view class="appBg"></view>
     <scroll-view scroll-y class="memberListCon">
-      <view wx:for="{{ addressList }}" wx:key="index" bind:tap="onSelect" data-item="{{ item }}" class="memberInfo {{ item.id === id?'active':'' }}">
-        <view class="infoCon">
-          <image class="tip" src="../orders/images/member.png" />
-          <text class="name">{{item.name}}</text>
-          <text class="phone">{{item.phoneNumber}}</text>
-        </view>
-        <view class="schoolInfoCon">
-          <text class="schoolInfo">收货地址</text><text class="schoolInfoDes">{{
+      <block wx:if="{{ addressList.length }}">
+        <view wx:for="{{ addressList }}" wx:key="index" bind:tap="onSelect" data-item="{{ item }}" class="memberInfo {{ item.id === id?'active':'' }}">
+          <view class="infoCon">
+            <image class="tip" src="../orders/images/member.png" />
+            <text class="name">{{item.name}}</text>
+            <text class="phone">{{item.phoneNumber}}</text>
+          </view>
+          <view class="schoolInfoCon">
+            <text class="schoolInfo">收货地址</text><text class="schoolInfoDes">{{
           item.provinceName + item.cityName + item.regionName + item.detailAddress
         }}
-          </text>
-        </view>
-        <view class="operateCon">
-          <view class="radio">
-            <image wx:if="{{item.id === id}}" src="../login/images/radio-active.png"></image>
-            <image wx:else src="../login/images/radio-default.png"></image>
-            <text>{{ item.id === id ? "当前选中" : "未选中"}}</text>
+            </text>
           </view>
-          <view class="operate">
-            <view catch:tap="onDel" data-id="{{ item.id }}">删除</view>
-            <view catch:tap="onEdit" data-id="{{ item.id }}">编辑</view>
+          <view class="operateCon">
+            <view class="radio">
+              <image wx:if="{{item.id === id}}" src="../login/images/radio-active.png"></image>
+              <image wx:else src="../login/images/radio-default.png"></image>
+              <text>{{ item.id === id ? "当前选中" : "未选中"}}</text>
+            </view>
+            <view class="operate">
+              <view catch:tap="onDel" data-id="{{ item.id }}">删除</view>
+              <view catch:tap="onEdit" data-id="{{ item.id }}">编辑</view>
+            </view>
           </view>
         </view>
+      </block>
+      <view wx:else class="empty-box">
+        <image src="https://oss.dayaedu.com/ktyq/1739278149891.png"></image>
+        <view class="empty-text">暂无内容</view>
       </view>
     </scroll-view>
     <view class="submitCon">

+ 2 - 2
miniprogram/pages/download/download.ts

@@ -87,9 +87,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   }
 })

+ 2 - 1
miniprogram/pages/index/index.less

@@ -294,6 +294,7 @@ page {
           height: 32rpx;
         }
         .memberInfoCon{
+          margin-right: 24rpx;
           overflow: hidden;
         }
         .infoCon {
@@ -335,7 +336,6 @@ page {
             flex-shrink: 0;
           }
           .schoolInfoDes{
-            margin-right: 10rpx;
             font-weight: 400;
             font-size: 24rpx;
             color: #777777;
@@ -392,6 +392,7 @@ page {
         display: flex;
         flex-wrap: wrap;
         &.instrumentsList{
+          padding-bottom: 40rpx;
           .goodsItem{
             padding: 10rpx 24rpx;
           }

+ 4 - 4
miniprogram/pages/index/index.ts

@@ -258,16 +258,16 @@ Page({
   },
   onShareAppMessage() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   },
   onShareTimeline() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   }
 })

+ 6 - 0
miniprogram/pages/login/login.less

@@ -3,6 +3,12 @@
   background: #FFFFFF;
   position: relative;
 }
+
+.weui-navigation-bar {
+  position: relative;
+  z-index: 2;
+}
+
 .appBg{
   position: absolute;
   left: 0;

+ 2 - 2
miniprogram/pages/login/login.ts

@@ -144,9 +144,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   }
 })

+ 1 - 1
miniprogram/pages/login/login.wxml

@@ -4,7 +4,7 @@
   <navigation-bar title="" ></navigation-bar>
   <view class="appInfo">
     <image class="appImg" src="https://oss.dayaedu.com/ktyq/1738896831535.png"></image>
-    <image class="appname" src="https://oss.dayaedu.com/ktyq/1739445615235.png"></image>
+    <image class="appname" src="https://oss.dayaedu.com/ktyq/1739757328217.png"></image>
   </view>
   <view class="login-section">
     <view class="btnSection">

+ 8 - 1
miniprogram/pages/member/addMember.less

@@ -107,11 +107,18 @@
         .fromIpt {
           margin-left: 20rpx;
           flex-grow: 1;
+          .index--van-cell{
+            padding-right: 0;
+          }
+          .index--van-cell__right-icon-wrap {
+            margin-right: -6rpx !important;
+            color: #cccccc !important;
+          }
           .van-field {
             padding: 0;
             --cell-line-height: 80rpx;
-
             .van-cell__right-icon {
+              margin-right: -6rpx;
               color: #cccccc;
             }
           }

+ 18 - 31
miniprogram/pages/member/addMember.ts

@@ -69,7 +69,6 @@ Page({
     showSchool: false,
     schoolLoading: false,
     schoolAreaList: [] as any,
-    tempChangeSchoolAreaId: '', // 临时改变的学校id
     schoolAreaId: '', //学校
     schoolAreaName: '',
     schoolAreaIndex: 0,
@@ -138,10 +137,6 @@ Page({
         const schoolAreaIndex = this.data.schoolAreaList.findIndex(((item: any) => {
           return item.value === this.data.schoolAreaId
         }))
-        // 获取学校列表之后 需要给tempChangeSchoolAreaId赋值 因为tempChangeSchoolAreaId默认选中第一个
-        this.setData({
-          tempChangeSchoolAreaId: params.schoolAreaId
-        })
         // 筛选出年级 赋值班级
         const gradeIndex = (this.data.gradeList[0]?.values || []).findIndex((item: any) => {
           return item.value === params.currentGradeNum
@@ -214,7 +209,6 @@ Page({
       showArea: false,
 
       searchName: "",
-      tempChangeSchoolAreaId: '',
       schoolAreaId: '',
       schoolAreaName: '',
       schoolAreaIndex: 0,
@@ -306,12 +300,6 @@ Page({
       showSchool: false
     })
   },
-  onChangeSchool(e: any) {
-    const { value } = e.detail.value
-    this.setData({
-      tempChangeSchoolAreaId: value
-    })
-  },
   onSearchChange(e: any) {
     this.setData({
       searchName: e.detail
@@ -322,14 +310,16 @@ Page({
   },
   /** 确定选择学校 */
   onSubmitSchool() {
-    if (!this.data.tempChangeSchoolAreaId) {
+    const schoolAreaVal = this.selectComponent("#schoolAreaId")?.getValues() || []
+    const schoolAreaId = schoolAreaVal[0]?.value
+    if (!schoolAreaId) {
       wx.showToast({
         title: '未选中值',
         icon: 'none'
       })
       return
     }
-    const schoolAreaIndex = this.data.schoolAreaList.findIndex((item: any) => item.value === this.data.tempChangeSchoolAreaId)
+    const schoolAreaIndex = this.data.schoolAreaList.findIndex((item: any) => item.value === schoolAreaId)
     const detail = this.data.schoolAreaList[schoolAreaIndex]
     if (detail.value == this.data.schoolAreaId) {
       this.setData({
@@ -383,15 +373,16 @@ Page({
         })
       })
 
-      let tempSchoolId = ''
-      if (tempList.length > 0) {
-        const first = tempList[0]
-        tempSchoolId = first.value || ''
-      }
 
+      const schoolAreaIndex = tempList.findIndex((item: any) => item.value === this.data.schoolAreaId)
       this.setData({
-        schoolAreaList: tempList,
-        tempChangeSchoolAreaId: tempSchoolId
+        schoolAreaIndex,
+        schoolAreaList: tempList
+      }, () => {
+        const schoolRef = this.selectComponent("#schoolAreaId")
+        if (schoolRef && schoolAreaIndex > -1) {
+          schoolRef.setIndexes([schoolAreaIndex])
+        }
       })
     } catch {
       // 
@@ -533,7 +524,7 @@ Page({
       gradeName: selectedOptions[0].text,
       showGrade: false,
       gradeIndex,
-      
+
       classId: "",
       className: "",
       classIndex: 0,
@@ -673,10 +664,6 @@ Page({
           schoolAreaId: params.schoolAreaId,
           defaultStatus: false
         })
-        wx.showToast({
-          title: '保存成功',
-          icon: 'none'
-        })
       } else {
         const { data } = await api_userBeneficiarySave({
           "phone": params.phone,
@@ -690,13 +677,13 @@ Page({
         if (this.data.redirectUrl === "index") {
           prevPage.setData({ memberInfo: { id: data.data.id, name: params.name, phone: params.phone, schoolInfo: params.provinceName + params.cityName + (params.regionName || "") + params.schoolAreaName + params.gradeName + params.className } });
         }
-        wx.showToast({
-          title: '保存成功',
-          icon: 'none'
-        })
       }
       wx.hideLoading()
-      wx.navigateBack()
+      wx.showToast({
+        title: '保存成功',
+        icon: 'none'
+      })
+      setTimeout(() => { wx.navigateBack() }, 1000)
     } catch {
       wx.hideLoading()
       // 

+ 1 - 1
miniprogram/pages/member/addMember.wxml

@@ -83,7 +83,7 @@
             <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
           </van-search>
         </view>
-        <van-picker wx:if="{{schoolAreaList.length}}" loading="{{ schoolLoading }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="6" default-index="{{ schoolAreaIndex }}">
+        <van-picker id="schoolAreaId" wx:if="{{schoolAreaList.length}}" loading="{{ schoolLoading }}" columns="{{ schoolAreaList }}" visible-item-count="6" default-index="{{ schoolAreaIndex }}">
         </van-picker>
         <view wx:else class="empty-box">
           <image src="https://oss.dayaedu.com/ktyq/1739278149891.png"></image>

+ 21 - 0
miniprogram/pages/member/memberList.less

@@ -89,6 +89,7 @@
           font-size: 24rpx;
           color: #777777;
           line-height: 32rpx;
+          word-break: break-all;
         }
       }
 
@@ -136,6 +137,26 @@
         }
       }
     }
+    .empty-box {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -70%);
+    
+      image {
+        width: 375rpx;
+        height: 250rpx;
+      }
+    
+      .empty-text {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #AAAAAA;
+        line-height: 40rpx;
+        text-align: center;
+        padding-top: -24rpx;
+      }
+    }
   }
 
   .submitCon {

+ 24 - 18
miniprogram/pages/member/memberList.wxml

@@ -2,29 +2,35 @@
   <navigation-bar title="选择会员享用人"></navigation-bar>
   <view class="appBg"></view>
   <scroll-view scroll-y class="memberListCon">
-    <view wx:for="{{ memberList }}" wx:key="index" bind:tap="onSelect" data-item="{{ item }}" class="memberInfo {{ item.id === id?'active':'' }}">
-      <view class="infoCon">
-        <image class="tip" src="../index/images/member.png" />
-        <text class="name">{{item.name}}</text>
-        <text class="phone">{{item.phone}}</text>
-      </view>
-      <view class="schoolInfoCon">
-        <text class="schoolInfo">学校信息</text><text class="schoolInfoDes">{{
+    <block wx:if="{{ memberList.length }}">
+      <view wx:for="{{ memberList }}" wx:key="index" bind:tap="onSelect" data-item="{{ item }}" class="memberInfo {{ item.id === id?'active':'' }}">
+        <view class="infoCon">
+          <image class="tip" src="../index/images/member.png" />
+          <text class="name">{{item.name}}</text>
+          <text class="phone">{{item.phone}}</text>
+        </view>
+        <view class="schoolInfoCon">
+          <text class="schoolInfo">学校信息</text><text class="schoolInfoDes">{{
           item.provinceName + item.cityName + item.regionName + item.schoolAreaName  + my.GRADE_ENUM[item.currentGradeNum] + item.currentClass + "班"
         }}
-        </text>
-      </view>
-      <view class="operateCon">
-        <view class="radio">
-          <image wx:if="{{item.id === id}}" src="../login/images/radio-active.png"></image>
-          <image wx:else src="../login/images/radio-default.png"></image>
-          <text>{{ item.id === id ? "当前选中" : "未选中"}}</text>
+          </text>
         </view>
-        <view class="operate">
-          <view catch:tap="onDel" data-id="{{ item.id }}">删除</view>
-          <view catch:tap="onEdit" data-id="{{ item.id }}">编辑</view>
+        <view class="operateCon">
+          <view class="radio">
+            <image wx:if="{{item.id === id}}" src="../login/images/radio-active.png"></image>
+            <image wx:else src="../login/images/radio-default.png"></image>
+            <text>{{ item.id === id ? "当前选中" : "未选中"}}</text>
+          </view>
+          <view class="operate">
+            <view catch:tap="onDel" data-id="{{ item.id }}">删除</view>
+            <view catch:tap="onEdit" data-id="{{ item.id }}">编辑</view>
+          </view>
         </view>
       </view>
+    </block>
+    <view wx:else class="empty-box">
+      <image src="https://oss.dayaedu.com/ktyq/1739278149891.png"></image>
+      <view class="empty-text">暂无内容</view>
     </view>
   </scroll-view>
   <view class="submitCon">

+ 3 - 2
miniprogram/pages/orders/order-detail.less

@@ -95,6 +95,7 @@
     }
 
     .memberInfoCon {
+      margin-right: 24rpx;
       overflow: hidden;
     }
 
@@ -140,7 +141,6 @@
       }
 
       .schoolInfoDes {
-        margin-right: 10rpx;
         font-weight: 400;
         font-size: 24rpx;
         color: #777777;
@@ -357,6 +357,8 @@
 
   text {
     &:nth-child(1) {
+      margin-right: 28rpx;
+      width: 140rpx;
       flex-shrink: 0;
       font-weight: 400;
       font-size: 28rpx;
@@ -365,7 +367,6 @@
     }
 
     &:nth-child(2) {
-      margin-left: 30rpx;
       word-break: break-all;
       text-align: right;
       font-weight: 400;

+ 15 - 16
miniprogram/pages/orders/order-detail.ts

@@ -59,6 +59,9 @@ Page({
     this.setData({
       isAddressInfoTip: false
     })
+    if (this.data.goodsInfo.orderNo) {
+      return
+    }
     try {
       const resData = await api_getUserReceiveAddressPage()
       const pageRows = resData?.data?.data?.rows || []
@@ -176,21 +179,11 @@ Page({
         if (data.code === 200) {
           const { paymentConfig, paymentType, orderNo } = data.data
           this.onExecutePay(paymentConfig, paymentType, orderNo)
-        } else if (data.code === 5200) {
-          wx.hideLoading()
-          wx.showToast({
-            title: data.message,
-            icon: 'none'
-          })
         } else if (data.code === 5435) {
-          wx.hideLoading()
-          wx.showToast({
-            title: data.message,
-            icon: 'none'
-          })
+          this.onPayError(data.message)
           setTimeout(() => { wx.navigateBack() }, 1000)
-        } else {
-          this.onPayError()
+        }else {
+          this.onPayError(data.message)
         }
       }
     } catch {
@@ -213,7 +206,10 @@ Page({
         wx.hideLoading()
         if (res.data.code === 200) {
           this.onPay(paymentType, res.data.data.reqParams, orderNo)
-        } else {
+        } else if (res.data.code === 5435) {
+          this.onPayError(res.data.message)
+          setTimeout(() => { wx.navigateBack() }, 1000)
+        }else {
           this.onPayError(res.data.message)
         }
       },
@@ -249,6 +245,9 @@ Page({
         that.setData({
           goodsInfo
         })
+        wx.redirectTo({
+          url: '/pages/orders/order-result?orderNo=' + orderNo
+        })
       }
     })
   },
@@ -258,9 +257,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   }
 })

+ 1 - 1
miniprogram/pages/orders/order-detail.wxml

@@ -29,7 +29,7 @@
               <text class="schoolInfo">收货地址</text><text class="schoolInfoDes">{{addressInfo.addressDes}}</text>
             </view>
           </view>
-          <image class="chevronImg" src="../index/images/chevron.png"></image>
+          <image wx:if="{{ !goodsInfo.orderNo }}" class="chevronImg" src="../index/images/chevron.png"></image>
         </view>
       </view>
 

+ 5 - 3
miniprogram/pages/orders/order-result.less

@@ -73,7 +73,7 @@
   }
 
   .memberCon {
-    padding: 24rpx;
+    padding: 24rpx 24rpx 14rpx 24rpx;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -129,6 +129,7 @@
 
     .schoolInfoCon {
       margin-top: 20rpx;
+      padding-bottom: 10rpx;
 
       .schoolInfo {
         margin-right: 8rpx;
@@ -143,11 +144,11 @@
       }
 
       .schoolInfoDes {
-        margin-right: 10rpx;
         font-weight: 400;
         font-size: 24rpx;
         color: #777777;
         line-height: 32rpx;
+        word-break: break-all;
       }
     }
   }
@@ -375,6 +376,8 @@
   }
   >text {
     &:nth-child(1) {
+      margin-right: 28rpx;
+      width: 140rpx;
       flex-shrink: 0;
       font-weight: 400;
       font-size: 28rpx;
@@ -383,7 +386,6 @@
     }
 
     &:nth-child(2) {
-      margin-left: 30rpx;
       word-break: break-all;
       text-align: right;
       font-weight: 400;

+ 11 - 4
miniprogram/pages/orders/order-result.ts

@@ -260,7 +260,7 @@ Page({
             title: data.message,
             icon: 'none'
           })
-        } else if (data.code === 5435) {
+        } else if ([5435, 5436, 5437, 5439, 5442, 5443, 5408, 5427, 5432].includes(data.code)) {
           wx.hideLoading()
           wx.showToast({
             title: data.message,
@@ -268,7 +268,7 @@ Page({
           })
           setTimeout(() => { wx.navigateBack() }, 1000)
         } else {
-          this.onPayError()
+          this.onPayError(data.message)
         }
       }
     } catch {
@@ -291,6 +291,13 @@ Page({
         wx.hideLoading()
         if (res.data.code === 200) {
           this.onPay(paymentType, res.data.data.reqParams, orderNo)
+        } else if ([5435, 5436, 5437, 5439, 5442, 5443, 5408, 5427, 5432].includes(res.data.code)) {
+          wx.hideLoading()
+          wx.showToast({
+            title: res.data.message,
+            icon: 'none'
+          })
+          setTimeout(() => { wx.navigateBack() }, 1000)
         } else {
           this.onPayError(res.data.message)
         }
@@ -336,9 +343,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   }
 })

+ 2 - 2
miniprogram/pages/orders/order-result1.ts

@@ -313,9 +313,9 @@ Page({
   },
   onShareAppMessage() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   }
 })

+ 1 - 1
miniprogram/pages/orders/orders.less

@@ -52,7 +52,7 @@
         position: absolute;
         left: 50%;
         transform: translateX(-50%);
-        bottom: -6rpx;
+        bottom: -10rpx;
         z-index: -1;
         width: 32rpx;
         height: 8rpx;

+ 17 - 5
miniprogram/pages/orders/orders.ts

@@ -236,8 +236,12 @@ Page({
       if (data.code === 200) {
         const { paymentConfig, paymentType, orderNo } = data.data.paymentConfig
         this.onExecutePay(paymentConfig, paymentType, orderNo)
-      } else {
-        this.onPayError()
+      } else if ([5435, 5436, 5437, 5439, 5442, 5443, 5408, 5427, 5432].includes(data.code)) {
+        wx.hideLoading()
+        wx.showToast({
+          title: data.message,
+          icon: 'none'
+        })
         setTimeout(() => {
           this.setData(
             {
@@ -250,6 +254,8 @@ Page({
             }
           );
         }, 1000)
+      } else {
+        this.onPayError(data.message)
       }
     } catch {
       wx.hideLoading()
@@ -269,7 +275,12 @@ Page({
         wx.hideLoading()
         if (res.data.code === 200) {
           this.onPaying(paymentType, res.data.data.reqParams, orderNo)
-        } else {
+        } else if ([5435, 5436, 5437, 5439, 5442, 5443, 5408, 5427, 5432].includes(res.data.code)) {
+          wx.hideLoading()
+          wx.showToast({
+            title: res.data.message,
+            icon: 'none'
+          })
           setTimeout(() => {
             this.setData(
               {
@@ -282,6 +293,7 @@ Page({
               }
             );
           }, 1000)
+        } else {
           this.onPayError(res.data.message)
         }
       },
@@ -412,9 +424,9 @@ Page({
   },
   onShareAppMessage() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   }
 })

+ 2 - 2
miniprogram/pages/protocol/register.ts

@@ -93,9 +93,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '音乐数字AI器乐工具',
+      title: '乐迷器乐AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733311074676.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739773011143.png'
     }
   }
 })

+ 1 - 1
node_modules/.package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "miniprogram-ts-less-quickstart",
   "version": "1.0.0",
-  "lockfileVersion": 3,
+  "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "node_modules/@vant/weapp": {