dreamnight 5 år sedan
förälder
incheckning
693c5ecf1e

+ 1 - 1
src/components/activityCard.vue

@@ -5,7 +5,7 @@
            lazy-load
            :src="value.imgs | imgFilter(2)"
            mode="aspectFill"></image>
-    <view class="u-flex-1 u-m-l-16">
+    <view class="u-flex-1 u-m-l-16 u-p-t-8">
       <view class="card-title u-font-28 bold u-line-1">{{value.title}}</view>
       <view class="card-desc u-flex u-content-color u-m-t-4 u-m-b-12">
         <view>平台:{{value.plat_type | platFilter}}</view>

+ 20 - 19
src/pages/classification.vue

@@ -25,33 +25,34 @@
             backgroundColor: '#FD5B36',
             boxShadow: '0px 1px 1px 0px rgba(255, 102, 50, 0.3)'
           }"
+                :active-item-style="{
+            fontSize: '32rpx'
+          }"
                 @change="changeTab">
         </u-tabs>
       </view>
     </u-sticky>
-    <block v-if="isLocation">
+    <block v-if="isLocation && activityList.length !== 0">
       <view class="activity-list"
             :style="{marginTop: `${activityListMT}rpx`}">
-        <block v-if="activityList.length !== 0">
-          <view class="activity-card u-border-bottom"
-                v-for="(item, index) in activityList"
-                :key="index">
-            <activity-card :value="item"
-                           @sign-up="toActivityDetail"
-                           @click-ybm="toActivityDetail"
-                           @click-yqg="toActivityDetail">
-            </activity-card>
-          </view>
-          <view class="touch-bottom u-font-22 line-32 u-text-center">{{isLoadMore ? '加载中...' : '到底了~'}}</view>
-        </block>
-        <block v-else>
-          <view class="no-location def-content">
-            <def-content type="1"></def-content>
-          </view>
-        </block>
+        <view class="activity-card u-border-bottom"
+              v-for="(item, index) in activityList"
+              :key="index">
+          <activity-card :value="item"
+                          @sign-up="toActivityDetail"
+                          @click-ybm="toActivityDetail"
+                          @click-yqg="toActivityDetail">
+          </activity-card>
+        </view>
+        <view class="touch-bottom u-font-22 line-32 u-text-center">{{isLoadMore ? '加载中...' : '到底了~'}}</view>
+      </view>
+    </block>
+    <block v-if="!isLocation && activityList.length === 0">
+      <view class="def-content">
+        <def-content type="1"></def-content>
       </view>
     </block>
-    <block v-else>
+    <block v-if="!isLocation">
       <view class="def-content">
         <def-content type="2"></def-content>
       </view>

+ 1 - 0
src/pages/index.vue

@@ -60,6 +60,7 @@
                 bottom: '-10rpx',
                 width: '104rpx',
                 height: '10rpx',
+                borderRadius: '0',
                 backgroundColor: '#FD6D4E',
                 boxShadow: '0rpx 1rpx 1rpx 0rpx rgba(255, 102, 50, 0.3)'
               }"

+ 16 - 5
src/pagesSub/activity/activityDetail.vue

@@ -8,7 +8,7 @@
              mode="aspectFill"></image>
       <view class="detail-over">
         <text class="detail-title u-line-2 u-font-40 line-56 u-tips-color bold">【{{detail.activity_type | activityTyepFilter}}】{{detail.title}}</text>
-        <view class="u-flex u-col-bottom u-p-t-24 u-p-b-14 u-border-bottom">
+        <view class="u-flex u-col-bottom u-p-t-24 u-p-b-28 u-border-bottom">
           <text class="u-primary-color u-font-28 line-40">返利:</text>
           <block v-if="detail.activity_type === 1">
             <text class="u-flex-1 u-primary-color u-font-36 line-50 bold">实付全返</text>
@@ -50,7 +50,7 @@
           </view>
         </block>
         <block v-if="detail.plat_type === 9">
-          <view class="to-btn u-p-l-28"
+          <view class="to-btn u-p-l-40"
                 @click="openOtherApplte()">
             <view class="icon-mt-wh icon-mt"></view>
             <view class="u-m-t-2 u-font-22 u-content-color line-32">打开美团</view>
@@ -60,11 +60,11 @@
     </view>
     <view class="act-able-time u-m-t-16">
       <view class="u-font-36 line-50 u-tips-color bold">活动可用时间</view>
-      <view class="u-flex">
+      <view class="u-flex u-m-t-16">
         <text class="u-flex-1 u-content-color line-40 u-line-2 u-p-r-32">{{businessHours}}营业时间可用(当天参与报名,需当天提交资料才能有效返款)</text>
         <view class="divider-right"></view>
-        <button class="to-btn contact-btn u-p-l-28"
-                open-type="contact">
+        <button class="to-btn contact-btn u-p-l-40"
+                @click="copyWx">
           <view class="icon-phone-wh icon-phone"></view>
           <view class="u-m-t-2 u-font-22 u-content-color line-32">联系客服</view>
         </button>
@@ -393,6 +393,17 @@ export default {
         appId: this.detail.app_info.appid,
         path: this.detail.app_info.path
       })
+    },
+    copyWx () {
+      uni.setClipboardData({
+        data: this.detail.kf_wechat,
+        success: () => {
+          uni.showToast({
+            icon: 'none',
+            title: '已复制客服微信号,请添加客服反馈'
+          })
+        }
+      })
     }
   },
   filters: {

+ 10 - 7
src/pagesSub/my/about.vue

@@ -2,10 +2,10 @@
   <view class="main">
     <network-error />
     <view class="logo">
-      <iamge></iamge>
+      <image src="~@/static/common/logo_gywm.png"></image>
     </view>
     <view class="info u-font-26 line-36">
-      描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案
+      提供外卖返利和外卖霸王餐的服务平台,通过小程序到美团饿了么点外卖,寻找好吃又优惠的省钱攻略
     </view>
   </view>
 </template>
@@ -29,11 +29,14 @@ export default {
     padding: 64px 48px 0;
   }
   .logo {
-    width: 128px;
-    height: 128px;
-    border-radius: 8px;
-    background-color: $u-light-color;
-    margin: 0 auto 32px;
+    text-align: center;
+    image {
+      margin-top: 32px;
+      width: 128px;
+      height: 128px;
+      border-radius: 8px;
+      background-color: $u-light-color;
+    }
   }
   .info {
     color: #999999;

+ 1 - 1
src/pagesSub/order/rule.vue

@@ -2,7 +2,7 @@
   <view class="rule-main">
     <network-error />
     <view class="u-font-32 line-44 bold color-212121">符合活动的评价要求,需满足:</view>
-    <view class="u-m-t-16 u-font-28 line-20 color-333">{{detail.requirement}}</view>
+    <view class="u-m-t-16 u-font-28 line-32 color-333">{{detail.requirement}}</view>
   </view>
 </template>
 

BIN
src/static/common/logo_gywm.png