修改样式

miniprogram/components/apply-refound/apply-refound.less

@@ -80,9 +80,6 @@
       input {
         text-align: right;
         font-size: 30rpx;
-        &::placeholder {
-          color: #AAAAAA;
-        }
       }
     }
     .btnSection {

miniprogram/components/apply-refound/apply-refound.wxml

@@ -5,12 +5,12 @@
       <image bind:tap="onRefoundClose" class="icon-close" src="./images/icon-close.png"></image>
       <view class="use-title">申请退款</view>
       <view class="use-form">
-        <textarea placeholder="请输入您的退款原因" maxlength="100" bindinput="textareaInput" value="{{ refoundValue }}"></textarea>
+        <textarea placeholder="请输入您的退款原因" placeholder-style="color: #AAA" maxlength="100" bindinput="textareaInput" value="{{ refoundValue }}"></textarea>
         <view class="num">{{ refoundValue.length }}/100</view>
       </view>
       <view class="use-form__input">
         <view class="title"><text class="red">*</text>联系方式 <text class="sencd">(必填)</text></view>
-        <input placeholder="请输入手机号码" type="number" maxlength="11" bindinput="phoneInput" value="{{ refoundPhone }}"></input>
+        <input placeholder="请输入手机号码" placeholder-style="color: #AAA" type="number" maxlength="11" bindinput="phoneInput" value="{{ refoundPhone }}"></input>
       </view>
       <view class="btnSection">
         <button type="primary" bind:tap="onRefound">提交申请</button>

miniprogram/components/navigation-bar/navigation-bar.ts

@@ -60,17 +60,15 @@ Component({
   lifetimes: {
     attached() {
       const rect = wx.getMenuButtonBoundingClientRect()
-      wx.getSystemInfo({
-        success: (res) => {
-          const isAndroid = res.platform === 'android'
-          const isDevtools = res.platform === 'devtools'
-          this.setData({
-            ios: !isAndroid,
-            innerPaddingRight: `padding-right: ${res.windowWidth - rect.left}px`,
-            leftWidth: `width: ${res.windowWidth - rect.left }px`,
-            safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${res.safeArea.top}px); padding-top: ${res.safeArea.top}px` : ``
-          })
-        }
+      const wxDeviceInfo = wx.getDeviceInfo()
+      const wxWindowInfo = wx.getWindowInfo()
+      const isAndroid = wxDeviceInfo.platform === 'android'
+      const isDevtools = wxDeviceInfo.platform === 'devtools'
+      this.setData({
+        ios: !isAndroid,
+        innerPaddingRight: `padding-right: ${wxWindowInfo.windowWidth - rect.left}px`,
+        leftWidth: `width: ${wxWindowInfo.windowWidth - rect.left }px`,
+        safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${wxWindowInfo.safeArea.top}px); padding-top: ${wxWindowInfo.safeArea.top}px` : ``
       })
     },
   },

miniprogram/components/service/service.ts

@@ -8,6 +8,7 @@ Component({
   data: {
     popShow: false,
     btnShow: true,
+    maxTop: 0,
     top: 0,  // 初始的上偏移
     startY: 0, // 触摸起始点 Y 坐标
     windowWidth: 0, // 屏幕宽度
@@ -18,6 +19,9 @@ Component({
     attached() {
       // 获取屏幕宽高
       const systemInfo = wx.getWindowInfo();
+      const isAndroid = systemInfo.platform === 'android'
+      const isDevtools = systemInfo.platform === 'devtools'
+      const barHeight = !isAndroid ? 
       const globalTop = app.globalData.top
       this.setData({
         windowWidth: systemInfo.windowWidth,
@@ -40,7 +44,6 @@ Component({
       // 
     },
     onShow() {
-      console.log('onShow', '1212')
       this.setData({
         popShow: true
       })

miniprogram/components/service/service.wxml

@@ -3,7 +3,7 @@
   <view class="service-container" wx:if="{{ popShow }}">
     <view class="service-mask" bind:tap="onClose"></view>
     <view class="service-section" bind:tap="onClose">
-      <image src="https://oss.dayaedu.com/ktyq/1732273441507.png" data-src="https://oss.dayaedu.com/ktyq/1732273441507.png" mode="aspectFill" catch:tap="onOpen" show-menu-by-longpress="true" catch:longtap="onPerview" class="iconImg"></image>
+      <image src="https://oss.dayaedu.com/ktyq/1732518474110.png" data-src="https://oss.dayaedu.com/ktyq/1732518474110.png" mode="aspectFill" catch:tap="onOpen" show-menu-by-longpress="true" catch:longtap="onPerview" class="iconImg"></image>
 
       <image src="./images/icon-close.png" catch:tap="onClose" class="iconClose"></image>
     </view>

miniprogram/pages/index/index.less

@@ -87,6 +87,8 @@ page {
     display: flex;
     flex-direction: column;
     min-width: 210rpx;
+    padding-right: 12rpx;
+    flex-shrink: 0;
   }
 
   .left-top {
@@ -99,7 +101,7 @@ page {
   }
 
   .left-bottom {
-    padding-left: 16rpx;
+    padding-left: 24rpx;
   }
 
   .currentPrice {
@@ -130,7 +132,7 @@ page {
   // }
   .right {
     flex: 1 auto;
-    padding-top: 22rpx;
+    padding-top: 24rpx;
     font-weight: 400;
     font-size: 28rpx;
     color: #777777;
@@ -144,7 +146,7 @@ page {
     }
 
     .right-bottom {
-      padding-top: 40rpx;
+      padding-top: 46rpx;
     }
   }
 }
@@ -154,7 +156,7 @@ page {
   font-size: 30rpx;
   color: #502F00;
   line-height: 42rpx;
-  max-width: 460rpx;
+  max-width: 420rpx;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -504,6 +506,9 @@ page {
           margin-right: 0;
         }
 
+        &.selected .select-arrow {
+          display: none !important;
+        }
         .nameorprice {
           height: 82rpx;
           display: flex;
@@ -624,7 +629,7 @@ page {
     border-radius: 44rpx;
     font-weight: 500;
     font-size: 32rpx;
-    color: #FFFFFF;
+    color: #FBEAC9;
     padding-top: 0;
     padding-bottom: 0;
   }

miniprogram/pages/index/index.ts

@@ -12,14 +12,14 @@ Page({
    */
   data: {
     imgList: [
-      'https://oss.dayaedu.com/ktyq/1732173958445.png',
-      'https://oss.dayaedu.com/ktyq/1732173972772.png',
-      'https://oss.dayaedu.com/ktyq/1732173985370.png',
-      'https://oss.dayaedu.com/ktyq/1732173997722.png',
-      'https://oss.dayaedu.com/ktyq/1732174010387.png',
-      'https://oss.dayaedu.com/ktyq/1732174025169.png',
-      'https://oss.dayaedu.com/ktyq/1732501351014.png',
-      'https://oss.dayaedu.com/ktyq/1732174043543.png'
+      'https://oss.dayaedu.com/ktyq/1732519419507.png',
+      'https://oss.dayaedu.com/ktyq/1732519468124.png',
+      'https://oss.dayaedu.com/ktyq/1732519479416.png',
+      'https://oss.dayaedu.com/ktyq/1732519490037.png',
+      'https://oss.dayaedu.com/ktyq/1732519500580.png'
+      // 'https://oss.dayaedu.com/ktyq/1732174025169.png',
+      // 'https://oss.dayaedu.com/ktyq/1732501351014.png',
+      // 'https://oss.dayaedu.com/ktyq/1732174043543.png'
     ],
     goodsImgList: [
       'https://oss.dayaedu.com/ktyq/1732175006625.png',

miniprogram/pages/index/index.wxml

@@ -2,7 +2,7 @@
 <scroll-view class="scrollarea" id="scroll-view" scroll-y="{{popupShow ? false : true}}" type="list" bindscroll="onScrollView" scroll-into-view="{{scrolIntoView}}" scroll-top="{{ scrollTop }}">
   <view class="container">
     <!-- <view class="topShadow"></view> -->
-    <view class="slider-count">{{current + 1}}/{{8}}</view>
+    <view class="slider-count">{{current + 1}}/{{imgList.length}}</view>
     <swiper indicator-dots="{{false}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" bindchange="changeSwiper">
       <swiper-item wx:for="{{ imgList }}" wx:key="index">
         <view class="swiper-item ">
@@ -28,8 +28,10 @@
           </view>
           <view class="right">
             <view class="right-top">
-              <view class="originPrice" wx:if="{{ selected.originalPrice > selected.salePrice }}">原价 ¥{{ selected.originalPrice || '0.00' }}</view><text style="padding: 0 6rpx"> | </text>
-              <view class="saleNum"> 已售100W+</view>
+              <block wx:if="{{ selected.originalPrice > selected.salePrice }}">
+                <view class="originPrice">原价 ¥{{ selected.originalPrice || '0.00' }}</view><text style="padding: 0 6rpx"> | </text>
+              </block>
+              <view class="saleNum">已售100W+</view>
             </view>
             <view class="right-bottom">
               <view class="shopName">
@@ -58,7 +60,8 @@
 
       <!-- 有选择商品的时候  -->
       <view class="current-item" wx:if="{{!isOverSaled && selected.id}}">
-        您已选中：<text>{{ selected.typeName }}</text>，合计：<text>¥ {{ selected.showSalePrice }}</text>，已优惠：<text>¥ {{ selected.discountPrice }}</text>
+        您已选中：<text>{{ selected.typeName }}</text>，合计：<text>¥ {{ selected.showSalePrice }}</text>
+        <block wx:if="{{ selected.originalPrice > selected.salePrice }}">，已优惠：<text>¥ {{ selected.discountPrice }}</text></block>
       </view>
 
     </view>
@@ -74,7 +77,8 @@
     </view>
 
     <view class="scroll-current-item" wx:if="{{!isOverSaled && selected.id && opacity >= 1}}">
-      您已选中：<text>{{ selected.typeName }}</text> ，合计：<text>¥ {{ selected.showSalePrice }}</text>，已优惠：<text>¥ {{ selected.discountPrice }}</text>
+      您已选中：<text>{{ selected.typeName }}</text> ，合计：<text>¥ {{ selected.showSalePrice }}</text>
+      <block wx:if="{{ selected.originalPrice > selected.salePrice }}">，已优惠：<text>¥ {{ selected.discountPrice }}</text></block>
     </view>
 
     <view class="goodsSection">
@@ -126,7 +130,7 @@
               <view class="originPrice">原价 ¥{{ selected.originalPrice }}</view>
             </view>
             <view class="selected-info">
-              您已选中：<text>{{ selected.typeName }}</text> ，已优惠：<text>¥ {{ selected.discountPrice }}</text>
+              您已选中：<text>{{ selected.typeName }}</text> <block wx:if="{{ selected.originalPrice > selected.salePrice }}">，已优惠：<text>¥ {{ selected.discountPrice }}</text></block>
             </view>
           </view>
         </view>

miniprogram/pages/orders/order-detail.less

@@ -98,16 +98,16 @@ page {
     padding-top: 12rpx;
     .goods-card {
       height: 40rpx;
-      background: #FEEDF0;
+      background: #FDF2E2;
       border-radius: 6rpx;
       font-size: 26rpx;
-      color: #FE2451;
+      color: #502F00;
       line-height: 40rpx;
       padding: 0 12rpx;
     }
     .goods-num {
       font-size: 28rpx;
-      color: #777777;
+      color: #777;
       line-height: 36rpx;
     }
   }

miniprogram/pages/orders/order-result.less

@@ -78,7 +78,7 @@ page {
       font-size: 30rpx;
       color: #131415;
       text-overflow: ellipsis;
-      max-width: 380rpx;
+      max-width: 360rpx;
     }
     .goods-price {
       flex-shrink: 0;
@@ -87,6 +87,9 @@ page {
       font-size: 28rpx;
       color: #131415;
       line-height: 48rpx;
+      text {
+        font-size: 34rpx;
+      }
     }
   }
 
@@ -101,10 +104,10 @@ page {
       font-size: 26rpx;
       color: #502F00;
       line-height: 36rpx;
-      padding: 0 12rpx;
+      padding: 2rpx 10rpx;
     }
     .goods-num {
-      font-size: 28rpx;
+      font-size: 26rpx;
       color: #777777;
       line-height: 36rpx;
     }
@@ -185,12 +188,14 @@ page {
   .my_draw_canvas {
     width: 202rpx;
     height: 202rpx;
+    background-color: #fff;
   }
   .qrcode-text {
     font-size: 28rpx;
     color: #131415;
     line-height: 40rpx;
     border-radius: 12rpx;
+    font-size: 24rpx;
     border: 2rpx solid #F2F2F2;
     padding: 16rpx 24rpx;
     text-align: left;
@@ -199,7 +204,7 @@ page {
       font-weight: bold;
     }
     &.used {
-      color: #AAAAAA;
+      color: #777;
     }
   }
 }

miniprogram/pages/orders/order-result.ts

@@ -154,26 +154,26 @@ Page({
       url: '../index/index'
     })
   },
-  // setCanvasSize: function () {
-  //   var size = {} as any;
-  //   try {
-  //     const res = wx.getWindowInfo()
-  //     var scale = 750 / 262; //不同屏幕下canvas的适配比例；设计稿是750宽
-  //     var width = res.windowWidth / scale;
-  //     var height = width; //canvas画布为正方形
-  //     size.w = width;
-  //     size.h = height;
-  //   } catch (e) {
-  //     // Do something when catch error
-  //     console.log("获取设备信息失败" + e);
-  //   }
-  //   return size;
-  // },
+  setCanvasSize: function () {
+    var size = {} as any;
+    try {
+      const res = wx.getWindowInfo()
+      var scale = 750 / 202; //不同屏幕下canvas的适配比例；设计稿是750宽
+      var width = res.windowWidth / scale;
+      var height = width; //canvas画布为正方形
+      size.w = width;
+      size.h = height;
+    } catch (e) {
+      // Do something when catch error
+      console.log("获取设备信息失败" + e);
+    }
+    return size;
+  },
   createQrCode(content: any, canvasId: any) {
-    // const size = this.setCanvasSize();
+    const size = this.setCanvasSize();
     drawQrcode({
-      width: 101,
-      height: 101,
+      width: size.w,
+      height: size.h,
       canvasId: canvasId,
       text: content,
       callback: () => {

miniprogram/pages/orders/order-result.wxml

@@ -17,11 +17,11 @@
         <view class="goods-desc">
           <view class="goodsInfo">
             <view class="goods-name">{{ item.goodsName }}</view>
-            <view class="goods-price">¥ {{ item.originalPrice }}</view>
+            <view class="goods-price">¥ <text>{{ item.originalPrice }}</text></view>
           </view>
           <view class="goods-type">
             <view class="goods-card">{{ item.typeName }}</view>
-            <view class="goods-num">共 {{ item.goodsNum }} 件</view>
+            <view class="goods-num">x{{ item.goodsNum }}</view>
           </view>
         </view>
       </view>
@@ -64,7 +64,7 @@
         <view class="title">退款金额</view>
         <view class="value">￥{{ goodsInfo.refundAmount }}</view>
       </view>
-      <view class="order-item">
+      <view class="order-item" wx:if="{{goodsInfo.wechatStatus != 'REFUNDING'}}">
         <view class="title">退款路径</view>
         <view class="value">{{ goodsInfo.refundStyleStr }}</view>
       </view>

miniprogram/pages/orders/orders.wxml

@@ -13,7 +13,7 @@
         <view class="list-item-group">
           <view class="list-item" wx:for="{{recordList}}" wx:key="index" data-orderno="{{item.orderNo}}"  data-wechatstatus="{{item.wechatStatus}}" bind:tap="onDetail">
             <view class="item-top">
-              <view class="item-mid">订单号：{{ item.orderNo }}</view>
+              <view class="item-mid">订单编号：{{ item.orderNo }}</view>
               <text class="{{ item.wechatStatus == 'WAIT_PAY' || item.wechatStatus == 'WAIT_USE' || item.wechatStatus == 'REFUNDING' ? 'red' : '' }}">{{ item.statusName }}</text>
             </view>
             <view class="item-content" wx:for="{{item.studentPaymentOrderDetails}}" wx:key="studentIndex">
@@ -25,7 +25,7 @@
                 </view>
                 <view class="goods-type">
                   <view class="goods-card" wx:if="{{ item.typeName }}">{{item.typeName}}</view>
-                  <view class="goods-num">x1</view>
+                  <view class="goods-num">x{{item.goodsNum}}</view>
                 </view>
               </view>
             </view>