订单代码还原

pages/welfareMall/feedback/feedback.js

@@ -6,7 +6,8 @@ Page({
    */
   data: {
     t_length: 0,
-    avatarUrl: []
+    avatarUrl: [],
+    chooseViewShowBanner: true
   },
 
   bindText: function (e) {
@@ -39,6 +40,7 @@ Page({
           //将临时变量赋值给已经在data中定义好的变量
            avatarUrl:imgArrNow
           })
+          that.chooseViewShowBanner();
          },
          fail: function(res) {
           // fail
@@ -65,7 +67,20 @@ Page({
       avatarUrl: avatarUrl
     })
     //判断是否隐藏选择图片
-    // this.chooseViewShowBanner();
+    this.chooseViewShowBanner();
+  },
+
+   /** 是否隐藏图片选择Banner*/
+   chooseViewShowBanner: function() {
+    if (this.data.avatarUrl.length >= 4) {
+      this.setData({
+        chooseViewShowBanner: false
+      })
+    } else {
+      this.setData({
+        chooseViewShowBanner: true
+      })
+    }
   },
 
    /** 图片预览 */

pages/welfareMall/feedback/feedback.wxml

@@ -1,23 +1,40 @@
 <!--pages/welfareMall/feedback/feedback.wxml-->
 <view class="feedback flex-column">
   <view class="feedback-style flex-column">
-    <view class="feedback-title">建议</view>
+    <view class="feedback-titles flex-row">
+      <view class="feedback-title">建议</view>
+    </view>
     <view class="feedback-text flex-column">
       <textarea class='suggest_text' bindinput="bindText" maxlength='500' placeholder='请输入您的建议' placeholder-class='sug_p'>
         </textarea>
       <view class="suggest_text-count flex-row"><text class="suggest_text-num">{{t_length}}/500</text></view>
     </view>
-    <view class="feedback-exp flex-row" catchtap="bindViewTap">
+    <view class="feedback-exp flex-row">
       <view class="feedback-explain">图片（选项）（最多添加4张）</view>
       <view></view>
     </view>
     <view class="explain-img flex-row">
+      <!--这个是已经选好的图片-->
       <view class="explain-img-style flex-column" wx:for="{{avatarUrl}}" wx:key="key" data-index="{{index}}" bindtap="previewImage">
         <view class="close-img-style flex-row">
           <image class="close-img" src="" mode="scaleToFill" catchtap="deleteImvBanner" data-id="{{index}}" src="/images/welfareMall/toDelete.png"></image>
         </view>
         <image class="explain-img-preview " src="{{item}}"></image>
       </view>
+      <!--这个是选择图片-->
+      <view bindtap="chooseBanner" wx:if="{{chooseViewShowBanner}}" catchtap="bindViewTap">
+        <view class="close-img-style">
+          <image class="close-img"></image>
+        </view>
+        <view class="explain-img-preview flex-column">
+          <image class="chooseImv" src="/images/welfareMall/img-choice.png"></image>
+        </view>
+      </view>
+    </view>
+    <view class="lower-submit flex-row">
+      <view class="order-refund flex-row">
+        <view class="lower-order-text">申请退款</view>
+      </view>
     </view>
   </view>
 </view>

pages/welfareMall/feedback/feedback.wxss

@@ -22,6 +22,18 @@
   justify-content: center;
 }
 
+.feedback-titles{
+  width: 659rpx;
+  height: 80rpx;
+  justify-content: flex-start;
+}
+
+.feedback-title{
+  font-size: 24rpx;
+  font-weight: 500;
+  color: #444444;
+}
+
 textarea{
   width: 659rpx;
   height: 320rpx;
@@ -45,7 +57,7 @@ textarea{
 
 .feedback-exp{
   width: 659rpx;
-  height: 120rpx;
+  height: 100rpx;
   justify-content: space-between;
 }
 
@@ -74,6 +86,7 @@ textarea{
   border: 1rpx solid #3E3E3E;
   border-radius: 10rpx;
   z-index: 1;
+  justify-content: center;
 }
 
 .close-img-style{
@@ -88,4 +101,28 @@ textarea{
   height: 22rpx;
   margin-top: 30rpx;
   margin-right: -5rpx;
+}
+
+.chooseImv{
+  width: 65rpx;
+  height: 64rpx;
+}
+
+.lower-submit{
+  width: 659rpx;
+  height: 100rpx;
+}
+
+.order-refund{
+  width: 150rpx;
+  height: 51rpx;
+  background: #FFFFFF;
+  border: 1rpx solid #B01717;
+  border-radius: 10rpx;
+}
+
+.lower-order-text{
+  font-size: 22rpx;
+  font-weight: 500;
+  color: #B01717;
 }

pages/welfareMall/order/orderCompletion.wxml

@@ -5,8 +5,6 @@
       <view class="order-state-title">订单已完成</view>
       <view class="order-state-text">感谢您对沪上阿姨的喜爱与支持，欢迎再度光临</view>
     </view>
-
-    <!-- 订单详情 -->
     <view class="order-details flex-column">
       <view class="content-hm flex-column">
         <view class="content-head flex-row">
@@ -23,10 +21,29 @@
           </view>
         </view>
       </view>
+      <view class="content-payment flex-row">
+        <view class="content-payment-mode">支付方式</view>
+        <view class="content-payment-mode">微信支付</view>
+      </view>
       <view class="content-line"></view>
       <view class="content-lower flex-row" catchtap="getCompletion">
         <view class="lower-total">共1件商品 合计￥9.9</view>
       </view>
     </view>
+    <view class="order-information flex-column">
+      <view class="order-information-code flex-row">
+        <view class="code-text">订单编号</view>
+        <view class="code-num">123455678897978779799</view>
+      </view>
+      <view class="order-information-date flex-row">
+        <view class="date-text">交易时间</view>
+        <view class="date-time">2021-11-24 14:20:38</view>
+      </view>
+    </view>
+    <view class="order-rt flex-row">
+      <view class="order-refund flex-row">
+        <view class="lower-order-text">申请退款</view>
+      </view>
+    </view>
   </view>
 </view>