lex-xin hai 6 meses
pai
achega
017e0617ec

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

@@ -13,7 +13,7 @@
         <input placeholder="请输入手机号码" type="number" maxlength="11" bindinput="phoneInput" value="{{ refoundPhone }}"></input>
       </view>
       <view class="btnSection">
-        <button type="primary" bind:tap="onRefound">申请退款</button>
+        <button type="primary" bind:tap="onRefound">提交申请</button>
       </view>
     </view>
   </view>

+ 1 - 1
miniprogram/config.ts

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

+ 35 - 0
miniprogram/pages/index/index.ts

@@ -11,6 +11,23 @@ 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'
+    ],
+    goodsImgList: [
+      'https://oss.dayaedu.com/ktyq/1732175006625.png',
+      'https://oss.dayaedu.com/ktyq/1732175021350.png',
+      'https://oss.dayaedu.com/ktyq/1732175031878.png',
+      'https://oss.dayaedu.com/ktyq/1732175041724.png',
+      'https://oss.dayaedu.com/ktyq/1732175051612.png'
+    ],
     serviceShow: true,
     scrollTop: 0,
     current: 0,
@@ -181,6 +198,24 @@ Page({
       })
     }, 500)()
   },
+  onPreivewBannerImg(e: { currentTarget: { dataset: any } }) {
+    wx.previewImage({
+      current: e.currentTarget.dataset.src,
+      urls: this.data.imgList
+    })
+  },
+  onPreivewGoodsImg(e: { currentTarget: { dataset: any } }) {
+    wx.previewImage({
+      current: e.currentTarget.dataset.src,
+      urls: this.data.goodsImgList
+    })
+  },
+  onPreivewGoods(e: { currentTarget: { dataset: any } }) {
+    wx.previewImage({
+      current: e.currentTarget.dataset.src,
+      urls: [e.currentTarget.dataset.src]
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */

+ 12 - 44
miniprogram/pages/index/index.wxml

@@ -4,44 +4,9 @@
     <!-- <view class="topShadow"></view> -->
     <view class="slider-count">{{current + 1}}/{{8}}</view>
     <swiper indicator-dots="{{false}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" bindchange="changeSwiper">
-      <swiper-item>
+      <swiper-item wx:for="{{ imgList }}" wx:key="index">
         <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732173958445.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732173972772.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732173985370.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732173997722.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732174010387.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732174025169.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732501351014.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732174043543.png"></image>
+          <image bind:tap="onPreivewBannerImg" src="{{ item }}" data-src="{{ item }}"></image>
         </view>
       </swiper-item>
     </swiper>
@@ -119,11 +84,14 @@
       </view>
       <view class="goodsIntro">
         <view class="images">
-          <image id="type1" mode="widthFix" src="https://oss.dayaedu.com/ktyq/1732175006625.png"></image>
-          <image mode="widthFix" src="https://oss.dayaedu.com/ktyq/1732175021350.png"></image>
-          <image mode="widthFix" src="https://oss.dayaedu.com/ktyq/1732175031878.png"></image>
-          <image id="type2" mode="widthFix" src="https://oss.dayaedu.com/ktyq/1732175041724.png"></image>
-          <image id="type3" mode="widthFix" src="https://oss.dayaedu.com/ktyq/1732175051612.png"></image>
+          <image id="type1" mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1732175006625.png" data-src="https://oss.dayaedu.com/ktyq/1732175006625.png"></image>
+          <image mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1732175021350.png" data-src="https://oss.dayaedu.com/ktyq/1732175021350.png"></image>
+          <image mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1732175031878.png" data-src="https://oss.dayaedu.com/ktyq/1732175031878.png"></image>
+          <image id="type2" mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1732175041724.png" data-src="https://oss.dayaedu.com/ktyq/1732175041724.png"></image>
+          <image id="type3" mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1732175051612.png" data-src="https://oss.dayaedu.com/ktyq/1732175051612.png"></image>
+          <!-- <block wx:for="{{ goodsImgList }}" wx:key="index">
+            <image id="{{ 'type1' + (index + 1) }}" mode="widthFix" bind:tap="onPreivewGoodsImg" data-src="{{item}}" src="{{ item }}"></image>
+          </block> -->
         </view>
       </view>
     </view>
@@ -145,7 +113,7 @@
 
         <view class="product-section">
           <view class="product-img">
-            <image src="{{ selected.pic }}"></image>
+            <image bind:tap="onPreivewGoods" data-src="{{ selected.pic }}" src="{{ selected.pic }}"></image>
           </view>
           <view>
             <view class="product-left">
@@ -154,7 +122,7 @@
                 <text class="priceZ">{{ selected.integerPart }}</text>
                 <text class="priceF">.{{ selected.decimalPart }}</text>
               </view>
-              <view class="originPrice">¥{{ selected.originalPrice }}</view>
+              <view class="originPrice">原价 ¥{{ selected.originalPrice }}</view>
             </view>
             <view class="selected-info">
               您已选中:<text>{{ selected.typeName }}</text> ,已优惠:<text>¥ {{ selected.discountPrice }}</text>

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

@@ -125,7 +125,7 @@ page {
         font-weight: 600;
         font-size: 28rpx;
         text-overflow: ellipsis;
-        max-width: 310rpx;
+        max-width: 320rpx;
       }
       .goods-price {
         flex-shrink: 0;

+ 2 - 2
miniprogram/pages/orders/orders.wxml

@@ -33,13 +33,13 @@
               <view class="order-price">
                 <!-- 订单金额:<text class="price">¥ {{item.amount}}</text> -->
               </view>
-              <block wx:if="{{ item.wechatStatus == 'REFUNDING' || item.wechatStatus == 'WAIT_USE' }}" wx:key="block">
+              <block wx:if="{{ item.wechatStatus == 'REFUNDING' || (item.wechatStatus == 'WAIT_USE' && tabIdx == 5) }}" wx:key="block">
                 <button wx:if="{{ item.wechatStatus == 'REFUNDING' }}" type="primary" wx:if="{{ item.wechatStatus == 'REFUNDING' }}"  catch:tap="onRefounded" data-id="{{item.id}}">取消退款</button>
                 <button wx:else type="primary" catch:tap="onRefounded" data-id="{{item.id}}">申请退款</button>
               </block>
               <block wx:else wx:key="block">
                 <button class="sure" type="primary" wx:if="{{ item.wechatStatus == 'WAIT_PAY' }}"  catch:tap="onPay" data-id="{{item.id}}">继续支付</button>
-                <button type="primary" wx:else catch:tap="onOne" data-id="{{item.id}}">再来一单</button>
+                <button type="primary" wx:else catch:tap="onOne" data-id="{{item.id}}">再次购买</button>
               </block>
             </view>
           </view>