lex-xin 4 ماه پیش
والد
کامیت
133b61a639

+ 4 - 0
miniprogram/pages/address/address-detail.less

@@ -145,6 +145,10 @@ toolbar-confirm {
     padding: 32rpx 32rpx 58rpx;
     padding: 32rpx 32rpx 58rpx;
     background: #FFFFFF;
     background: #FFFFFF;
     box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.5);
     box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.5);
+
+    button[disabled] {
+      color: #FEFFCA !important;
+    }
   }
   }
 
 
   .submit-btn {
   .submit-btn {

+ 1 - 1
miniprogram/pages/address/index.ts

@@ -55,7 +55,7 @@ Page({
   // 添加地址
   // 添加地址
   onShowAddress() {
   onShowAddress() {
     wx.navigateTo({
     wx.navigateTo({
-      url: `../address/address-detail?receiveAddress=${this.data.id}`,
+      url: `../address/address-detail`,
     })
     })
   },
   },
   /** Dialog 隐藏 */
   /** Dialog 隐藏 */

+ 6 - 4
miniprogram/pages/orders/order-detail.wxml

@@ -50,9 +50,11 @@
 
 
           <view class="goodsInfo-count">
           <view class="goodsInfo-count">
             <view class="goods-price">
             <view class="goods-price">
-              <text class="before">共{{ goodsInfo.goodsList.length }}件,共减</text>
-              <text class="stuff red">¥</text>
-              <text class="priceZ">{{ goodsInfo.discountIntegerPart }}.{{ goodsInfo.discountDecimalPart }}</text>
+              <text class="before">共{{ goodsInfo.goodsList.length }}件 <block wx:if="{{ goodsInfo.allDiscountPrice >0 }}">,共减</block></text>
+              <block wx:if="{{ goodsInfo.allDiscountPrice >0 }}">
+                <text class="stuff red">¥</text>
+                <text class="priceZ">{{ goodsInfo.discountIntegerPart }}.{{ goodsInfo.discountDecimalPart }}</text>
+              </block>
               <!-- <text class="priceF">.{{ goodsInfo.decimalPart }}</text> -->
               <!-- <text class="priceF">.{{ goodsInfo.decimalPart }}</text> -->
               <text class="afterTxt">应付:</text>
               <text class="afterTxt">应付:</text>
               <text class="stuff">¥</text>
               <text class="stuff">¥</text>
@@ -88,7 +90,7 @@
               <text class="priceF">.{{ goodsInfo.decimalPart }}</text>
               <text class="priceF">.{{ goodsInfo.decimalPart }}</text>
             </view>
             </view>
           </view>
           </view>
-          <view class="discountPrice">共减<text>¥{{ goodsInfo.allDiscountPrice }}</text></view>
+          <view class="discountPrice" wx:if="{{ goodsInfo.allDiscountPrice > 0 }}">共减<text>¥{{ goodsInfo.allDiscountPrice }}</text></view>
         </view>
         </view>
         <button type="primary" bind:tap="onSubmit">{{ goodsInfo.orderNo ? '继续支付' : '立即支付' }}</button>
         <button type="primary" bind:tap="onSubmit">{{ goodsInfo.orderNo ? '继续支付' : '立即支付' }}</button>
       </view>
       </view>

+ 3 - 3
miniprogram/pages/orders/order-result.ts

@@ -12,17 +12,17 @@ Page({
     statusList: {
     statusList: {
       WAIT_PAY: {
       WAIT_PAY: {
         logo: './images/ing.png',
         logo: './images/ing.png',
-        title: '待付款',
+        title: '待付款',
         content: '请尽快完成支付,以便我们为您处理订单'
         content: '请尽快完成支付,以便我们为您处理订单'
       },
       },
       PAID: {
       PAID: {
         logo: './images/success.png',
         logo: './images/success.png',
-        title: '交易完成',
+        title: '完成',
         content: '您的交易订单已完成,感谢您的选择'
         content: '您的交易订单已完成,感谢您的选择'
       },
       },
       CLOSED: {
       CLOSED: {
         logo: './images/error.png',
         logo: './images/error.png',
-        title: '交易取消',
+        title: '取消',
         content: '您的交易订单已关闭,请重新下单'
         content: '您的交易订单已关闭,请重新下单'
       },
       },
       WAIT_USE: {
       WAIT_USE: {

+ 2 - 2
miniprogram/pages/select-goods/index.wxml

@@ -18,7 +18,7 @@
           <text class="priceF">.{{ formatSelectGood.decimalPart }}</text>
           <text class="priceF">.{{ formatSelectGood.decimalPart }}</text>
         </view>
         </view>
         <text class="line"></text>
         <text class="line"></text>
-        <text class="discountPrice">优惠前 ¥{{ formatSelectGood.discountPrice }}</text>
+        <text class="discountPrice">优惠前 ¥{{ formatSelectGood.originalPrice }}</text>
       </view>
       </view>
 
 
       <!-- <image class="img_back" bind:tap="onBack" src="./images/icon-back.png"></image> -->
       <!-- <image class="img_back" bind:tap="onBack" src="./images/icon-back.png"></image> -->
@@ -81,7 +81,7 @@
         <view class="btn-add" bind:tap="onAddBuyer">添加</view>
         <view class="btn-add" bind:tap="onAddBuyer">添加</view>
       </view>
       </view>
 
 
-      <view class="select-buyer selected" wx:else>
+      <view class="select-buyer selected" wx:else bind:tap="onAddBuyer">
         <view class="desc">
         <view class="desc">
           <image src="./images/icon2.png" class="iconBefore"></image>选择权益享用人
           <image src="./images/icon2.png" class="iconBefore"></image>选择权益享用人
         </view>
         </view>

+ 1 - 1
project.config.json

@@ -42,5 +42,5 @@
     "ignore": [],
     "ignore": [],
     "include": []
     "include": []
   },
   },
-  "appid": "wx524b61f5bec60655"
+  "appid": "wxb1f36da5e7f07e14"
 }
 }