flx

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -75,45 +75,83 @@ export default (props) => {
                   item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> :
                     item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null
 
+
   return (
     <>
       {
         sh != '1' || kkp == '1' ? <view className='OrderNumber'>订单编号：{item.orderId}</view> : null
       }
-      <SlideViewOrder del onDelete={() => handeDelete(item)} >
-        <CouponCard action={PayAction}>
-          <CouponMedia>
-            <CouponMedia.Header
-              cashback={item.cashback}
-              image={item.poster}
-              badge='food'
-            />
-            <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>
-              <View className='orderCard'>
-                <View className='cpn-card-text'>
-                  <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>
-                  <text className={kkp == '1' ? 'shanchu' : 'title-money-2'}>
-                    数量：{item.amount}张
-                  </text>
-                </View>
-                <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-                  <Text className='cpn-card-text_mn'>￥{`${(item.unitPrice / 100)?.toFixed(2)}元`}</Text>
+      {
+        item.status === 0 ? <SlideViewOrder del onDelete={() => handeDelete(item)} >
+          <CouponCard action={PayAction}>
+            <CouponMedia>
+              <CouponMedia.Header
+                cashback={item.cashback}
+                image={item.poster}
+                badge='food'
+              />
+              <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>
+                <View className='orderCard'>
+                  <View className='cpn-card-text'>
+                    <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>
+                    <text className={kkp == '1' ? 'shanchu' : 'title-money-2'}>
+                      数量：{item.amount}张
+                    </text>
+                  </View>
+                  <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+                    <Text className='cpn-card-text_mn'>￥{`${(item.unitPrice / 100)?.toFixed(2)}元`}</Text>
+                  </View>
+                  <View className='cpn-md-act'>
+                    <view className={item.isVerified == 1 ? 'title-time' : ''}>
+                      {
+                        sh == 1 ? '有效期：' + formatTime(item.endTime, "yyyy/MM/dd") :
+                          item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
+                            '有效期：' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
+                            formatTime(item.endTime, "yyyy/MM/dd")
+                      }
+                    </view>
+                  </View>
                 </View>
-                <View className='cpn-md-act'>
-                  <view className={item.isVerified == 1 ? 'title-time' : ''}>
-                    {
-                      sh == 1 ? '有效期：' + formatTime(item.endTime, "yyyy/MM/dd") :
-                        item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
-                          '有效期：' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
-                          formatTime(item.endTime, "yyyy/MM/dd")
-                    }
-                  </view>
+              </CouponMedia.Body>
+            </CouponMedia>
+          </CouponCard>
+        </SlideViewOrder>
+          :
+          <CouponCard action={PayAction}>
+            <CouponMedia>
+              <CouponMedia.Header
+                cashback={item.cashback}
+                image={item.poster}
+                badge='food'
+              />
+              <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>
+                <View className='orderCard'>
+                  <View className='cpn-card-text'>
+                    <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>
+                    <text className={kkp == '1' ? 'shanchu' : 'title-money-2'}>
+                      数量：{item.amount}张
+                    </text>
+                  </View>
+                  <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+                    <Text className='cpn-card-text_mn'>￥{`${(item.unitPrice / 100)?.toFixed(2)}元`}</Text>
+                  </View>
+                  <View className='cpn-md-act'>
+                    <view className={item.isVerified == 1 ? 'title-time' : ''}>
+                      {
+                        sh == 1 ? '有效期：' + formatTime(item.endTime, "yyyy/MM/dd") :
+                          item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
+                            '有效期：' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
+                            formatTime(item.endTime, "yyyy/MM/dd")
+                      }
+                    </view>
+                  </View>
                 </View>
-              </View>
-            </CouponMedia.Body>
-          </CouponMedia>
-        </CouponCard>
-      </SlideViewOrder>
+              </CouponMedia.Body>
+            </CouponMedia>
+          </CouponCard>
+      }
+
     </>
+
   )
 }

src/components/CompoentsOrder/TobeWritten/index.jsx

@@ -1,58 +0,0 @@
-
-import formatTime from "@/utils/formatTime";
-import food from "@/assets/icons/ProCard/food.png";
-import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
-import QRcode from "@/assets/icons/UserCenter/QRcode.png";
-
-import './style.less'
-
-
-export default (props) => {
-
-  const { item, onWrite } = props
-
-  return (
-    <view class='wrapper'>
-      <view class='left-complete-one'>
-        <image className='left-image-1' src={ProCard_hot}></image>
-        <view className='left-viewText'>
-          返现￥{(item.cashback / 100).toFixed(2)}
-        </view>
-        <view className='title-image'>
-          <image
-            className='image-1'
-            mode='scaleToFill'
-            src={item.poster || []}
-          ></image>
-          <image className='image-2' src={food}></image>
-        </view>
-        <view className='title-content'>
-          <view className='Pro-title'>
-            <view className='title-text'>
-              {item.packageDescription}
-              <text className='title-money-2'>
-                数量：{item.amount}张
-              </text>
-            </view>
-          </view>
-          <text className='title-money'>
-            ￥{(item.unitPrice / 100).toFixed(2)}元
-          </text>
-          <view className='title-time'>
-            有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
-            {formatTime(item.endTime, "yyyy/MM/dd")}
-          </view>
-        </view>
-      </view>
-      <view class='right-complete-two'>
-        <view
-          className='right-content'
-          onClick={() => onWrite(item)}
-        >
-          <image className='right-image' src={QRcode} />
-          <view className='right-title'>扫码核销</view>
-        </view>
-      </view>
-    </view>
-  )
-}

src/components/CompoentsOrder/TobeWritten/style.less

@@ -1,180 +0,0 @@
-@whiteColor: #fff;
-
-.wrapper-Written {
-  margin-top: 40px;
-  display: flex;
-  position: relative;
-  margin: 30px auto;
-  width: 100%;
-  filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
-
-  .left-complete-one-Written {
-    padding-top: 85px;
-    padding-bottom: 43px;
-    position: relative;
-    display: flex;
-    background: @whiteColor;
-    background: radial-gradient(circle at top right, transparent 15px, #fff 0 0)
-        top right,
-      radial-gradient(circle at bottom right, transparent 15px, #fff 0 0) bottom
-        right;
-    background-size: 100% 60%;
-    background-repeat: no-repeat;
-
-    width: 573px;
-    border-radius: 15px 0px 0px 15px;
-    // border-radius: 12px;
-
-    align-items: center;
-    .left-image-1-Written {
-      width: 145px;
-      height: 44px;
-      position: absolute;
-      top: 22px;
-    }
-    .left-viewText-Written {
-      // background-image: url(@Image-ProCard_hot);
-      // width: 287px;
-      width: auto;
-      height: 44.3px;
-      position: absolute;
-      left: 1px;
-      top: 28px;
-      font-size: 20px;
-      color: @whiteColor;
-    }
-    //图片
-    .title-image-Written {
-      height: 144px;
-      margin-left: 20px;
-      border-radius: 24px;
-      overflow: hidden;
-      position: relative;
-      .image-1-Written {
-        width: 144px;
-        height: 144px;
-        margin: 0;
-      }
-      .image-2-Written {
-        width: 89px;
-        height: 34px;
-        position: absolute;
-        left: 0;
-      }
-    }
-    // 商品标题
-    .title-content-Written {
-      // padding: 84px 0 56px 20px;
-      padding-left: 18px;
-
-      .Pro-title-Written {
-        .title-text-Written {
-          width: 375px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          // display: -webkit-box; //必须要
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-          // word-break: break-all; /* 多出文本省略号代替 */
-          text-align: left;
-          font-size: 24px;
-          // padding-bottom: 10px;
-        }
-      }
-      .title-money-Written {
-        // padding-top: 34px;
-        font-size: 24px;
-        // color: red;
-        font-weight: 800;
-      }
-      .title-money-2-Written {
-        height: 19px;
-        font-size: 20px;
-        font-weight: 400;
-        color: #333333;
-        padding-left: 40px;
-      }
-
-      .title-time-Written {
-        font-size: 24px;
-        // padding-top: 20px;
-        color: #c0c8d3;
-      }
-      .title-position-on-Written {
-        display: flex;
-        font-size: 20px;
-        .title-position-Written {
-          width: 18px;
-          height: 24px;
-          padding-right: 10px;
-          padding-top: 5px;
-        }
-        .title-position-image-Written {
-          align-items: center;
-          font-size: 20px;
-          color: #333;
-        }
-        .title-on-Written {
-          // margin-bottom: 10px;
-          padding-top: 5px;
-          padding-left: 40px;
-          width: 21px;
-          height: 21px;
-          padding-right: 10px;
-        }
-        .title-on-text-Written {
-          align-items: center;
-
-          font-size: 20px;
-          color: #333;
-        }
-      }
-    }
-  }
-  .right-complete-two-Written {
-    background: @whiteColor;
-    background: radial-gradient(circle at top left, transparent 15px, #fff 0 0)
-        top left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff 0 0) bottom
-        left;
-    background-size: 100% 60%;
-    background-repeat: no-repeat;
-    width: 129px;
-    border-radius: 0 15px 15px 0;
-    position: relative;
-    //右面部分
-    .right-content-Written {
-      width: 100px;
-      height: 134px;
-      position: absolute;
-      top: calc(50% - 45px);
-      left: calc(50% - 46px);
-      .right-image-2-Written {
-        width: 76px;
-        height: 66px;
-        margin-top: 1em;
-      }
-      .right-image-Written {
-        width: 35px;
-        height: 34px;
-        margin-left: calc(50% - 17.5px);
-      }
-      .right-title-Written {
-        font-weight: 700;
-        font-size: 24px;
-        padding-top: 15px;
-        text-align: center;
-      }
-    }
-  }
-  //线条
-  .right-complete-two-Written::after {
-    content: "";
-    position: absolute;
-    top: 15px;
-    margin: 26px auto;
-    height: 70%;
-    border-left: 1px dashed #595959;
-    opacity: 0.12;
-  }
-}

src/components/add-tips/index.wxss

@@ -26,16 +26,14 @@
   zoom: 1.5;
 }
 .tips {
-  height: 200px;
-  width: 200px;
   flex: 1;
   color: #fff;
   font-size: 20px;
   font-weight: 700;
 }
 .logo {
-  height: 200px;
-  width: 200px;
+  height: 42px;
+  width: 42px;
   border-radius: 8px;
   margin-right: 10px;
 }