shenxin před 5 roky
rodič
revize
ee06c32d2f

+ 25 - 13
src/components/orderCard.vue

@@ -1,35 +1,46 @@
 <template>
-  <view class="order-card-main" @click.stop="clickCard">
+  <view class="order-card-main"
+        @click.stop="clickCard">
     <view class="u-flex">
       <view class="icon-shop-wh icon-shop"></view>
       <view class="shop-name u-m-l-8 u-line-1 line-34">{{value.shop_name}}</view>
       <view class="u-flex-1 u-text-right u-primary-color line-34">{{value.join_status | statusFilter}}</view>
     </view>
     <view class="u-flex u-m-t-16 u-p-b-24">
-      <image class="order-img" :src="value.imgs | imgFilter(3)" lazy-load mode="aspectFill"></image>
+      <image class="order-img"
+             :src="value.imgs | imgFilter(3)"
+             lazy-load
+             mode="aspectFill"></image>
       <view class="u-flex-1 u-m-l-16">
-        <block v-if="value.activity_type * 1 === 1">
+        <view class="u-font-28 line-40 bold">{{value.title}}</view>
+        <!-- <block v-if="value.activity_type * 1 === 1">
           <view class="u-font-28 line-40 bold">返利:实付全返</view>
         </block>
         <block v-if="value.activity_type * 1 === 2">
           <view class="u-font-28 line-40 bold">返利:¥{{(value.rebate_amount / 100).toFixed(2)}}</view>
-        </block>
-        <view class="u-font-22 u-m-t-8 line-32 u-content-color">平台:{{value.plat_type | platTypeFilter}}</view>
+        </block> -->
+        <!-- <view class="u-font-22 u-m-t-8 line-32 u-content-color">平台:{{value.plat_type | platTypeFilter}}</view> -->
+        <view class="u-font-22 u-m-t-8 line-32 u-content-color">报名时间:{{value.created_at}}</view>
         <block v-if="value.join_status * 1 === 4">
           <view class="reson-text u-m-t-8 u-font-22 line-32 u-other-color u-line-1">驳回原因:{{value.reject_reason}}</view>
         </block>
       </view>
     </view>
-    <view class="u-border-top u-p-t-16 u-p-b-16" v-if="value.join_status * 1 === 1 || value.join_status * 1 === 4">
+    <view class="u-border-top u-p-t-16 u-p-b-16"
+          v-if="value.join_status * 1 === 1 || value.join_status * 1 === 4">
       <block v-if="value.join_status * 1 === 1">
         <view class="u-flex u-row-right">
-          <button class="cancel-btn u-font-24 line-34" @click.stop="cancelSignUp">取消报名</button>
-          <button class="submit-btn u-font-24 line-34 u-m-l-24" @click.stop="submitResult">提交结果</button>
+          <button class="cancel-btn u-font-24 line-34"
+                  @click.stop="cancelSignUp">取消报名</button>
+          <button class="submit-btn u-font-24 line-34 u-m-l-24"
+                  @click.stop="submitResult">提交结果</button>
         </view>
       </block>
       <block v-if="value.join_status * 1 === 4">
         <view class="u-flex u-row-right">
-          <button class="cancel-btn u-font-24 line-34" open-type="contact" @click.stop>联系客服</button>
+          <button class="cancel-btn u-font-24 line-34"
+                  open-type="contact"
+                  @click.stop>联系客服</button>
         </view>
       </block>
     </view>
@@ -41,7 +52,7 @@ export default {
   props: {
     value: {
       type: Object,
-      default: () => {}
+      default: () => { }
     }
   },
   methods: {
@@ -98,7 +109,8 @@ export default {
   .reson-text {
     max-width: 426px;
   }
-  .cancel-btn, .submit-btn {
+  .cancel-btn,
+  .submit-btn {
     margin: 0;
     padding: 6px 24px;
     width: 144px;
@@ -109,7 +121,7 @@ export default {
   .cancel-btn {
     color: $u-main-color;
     &::after {
-      content: "";
+      content: '';
       display: flex;
       align-items: center;
       width: 200%;
@@ -124,7 +136,7 @@ export default {
   .submit-btn {
     color: $u-type-primary;
     &::after {
-      content: "";
+      content: '';
       display: flex;
       align-items: center;
       width: 200%;

+ 1 - 1
src/pagesSub/activity/signUpOutcome.vue

@@ -91,7 +91,7 @@ export default {
   button {
     width: 280px;
     height: 84px;
-    border: 1px solid #d3d4d5;
+    border: 2rpx solid #d3d4d5;
     border-radius: 42px;
     font-size: 28px;
     line-height: 40px;

+ 30 - 21
src/pagesSub/my/about.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-01-27 12:27:59
+ * @LastEditTime: 2021-01-27 14:07:05
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \rebatedine-mini\src\pagesSub\my\about.vue
+-->
 <template>
   <view class="main">
     <network-error />
@@ -15,31 +23,32 @@ export default {
   data () {
     return {}
   },
-  mounted () {},
+  mounted () { },
   methods: {}
 }
 </script>
 
 <style lang="scss" scoped>
-  .main {
-    width: 100%;
-    height: 100vh;
-    background-color: #fff;
-    box-sizing: border-box;
-    padding: 64px 48px 0;
-  }
-  .logo {
-    text-align: center;
-    image {
-      margin-top: 32px;
-      width: 128px;
-      height: 128px;
-      border-radius: 8px;
-      background-color: $u-light-color;
-    }
-  }
-  .info {
-    color: #999999;
-    text-align: center;
+.main {
+  width: 100%;
+  height: 100vh;
+  background-color: #fff;
+  box-sizing: border-box;
+  padding: 64px 48px 0;
+}
+.logo {
+  text-align: center;
+  image {
+    margin-top: 32px;
+    width: 128px;
+    height: 128px;
+    border-radius: 8px;
+    background-color: $u-light-color;
   }
+}
+.info {
+  color: #999999;
+  text-align: center;
+  margin-top: 32rpx;
+}
 </style>