From c3344d930f7aa374fb0403a2784202ebe1dcdfba Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 13 Aug 2023 16:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=AD=89=E7=BA=A7=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/activity/detail/detail.vue      |  2 +-
 .../membershiplevelvip/index/index.vue        | 34 ++++++++++---------
 .../signin/index-detail/index-detail.css      |  4 +++
 .../signin/index-detail/index-detail.vue      | 29 ++++------------
 4 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/pages/plugins/activity/detail/detail.vue b/pages/plugins/activity/detail/detail.vue
index d10486ee..cac49b46 100644
--- a/pages/plugins/activity/detail/detail.vue
+++ b/pages/plugins/activity/detail/detail.vue
@@ -3,7 +3,7 @@
         <view v-if="(data || null) != null">
             <view class="padding-horizontal-main padding-top-main">
                 <!-- 基础信息 -->
-                <view class="base-container tc pr padding-main border-radius-main bg-main oh spacing-mb" :style="'background-color:'+data.color+' !important;background-image:url('+data.cover+')'">
+                <view class="base-container tc pr padding-main border-radius-main bg-main oh spacing-mb" :style="'background-color:'+data.color+' !important;background-image:url('+(data.banner || data.cover)+')'">
                     <view class="text cr-white pa bs-bb text-size wh-auto ht-auto">{{data.describe}}</view>
                 </view>
 
diff --git a/pages/plugins/membershiplevelvip/index/index.vue b/pages/plugins/membershiplevelvip/index/index.vue
index 6b4adecd..d43cedcf 100644
--- a/pages/plugins/membershiplevelvip/index/index.vue
+++ b/pages/plugins/membershiplevelvip/index/index.vue
@@ -1,7 +1,7 @@
 <template>
     <view>
         <view v-if="(data_base || null) != null">
-            <view class="banner tc oh pr wh-auto" :style="'background-image: url(' + data_base.banner_bg_images + ');'">
+            <view class="banner tc oh pr wh-auto" :style="'background-image: url(' + default_images_data.default_bg_images + ');'">
                 <!-- 标题 -->
                 <view v-if="(data_base.banner_top_title || null) != null" class="banner-title single-text text-size-lg margin-top-xxxl">
                     {{data_base.banner_top_title}}
@@ -14,9 +14,9 @@
                     </button>
                 </navigator>
 
-                <!-- 数据列表 -->
-                <view v-if="(data_list || null) != null && data_list.length > 0" class="data-list oh margin-top-xxxl">
-                    <block v-for="(item, index) in data_list" :key="index" class="item fl">
+                <!-- 介绍列表 -->
+                <view v-if="(introduce_data || null) != null && introduce_data.length > 0" class="data-list oh margin-top-xxxl">
+                    <block v-for="(item, index) in introduce_data" :key="index" class="item fl">
                         <view class="item fl tc padding-main border-radius-main bg-white">
                             <view class="single-text cr-base text-size fw-b">{{item.name}}</view>
                             <view class="multi-text cr-grey margin-top-sm">{{item.desc}}</view>
@@ -53,8 +53,9 @@
                 data_bottom_line_status: false,
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
-                data_list: [],
-                data_base: null,
+                introduce_data: [],
+                data_base: null,
+                default_images_data: null,
                 // 自定义分享信息
                 share_info: {}
             };
@@ -85,12 +86,11 @@
 
             // 获取数据
             get_data_list() {
-                var self = this;
                 uni.showLoading({
                     title: '加载中...'
                 });
-                if (self.data_list.length <= 0) {
-                    self.setData({
+                if (this.introduce_data.length <= 0) {
+                    this.setData({
                         data_list_loding_status: 1
                     });
                 }
@@ -104,9 +104,10 @@
                         uni.stopPullDownRefresh();
                         if (res.data.code == 0) {
                             var data = res.data.data;
-                            self.setData({
-                                data_base: data.base || null,
-                                data_list: data.data || [],
+                            this.setData({
+                                data_base: data.base || null,
+                                default_images_data: data.default_images_data || null,
+                                introduce_data: data.introduce_data || [],
                                 data_list_loding_msg: '',
                                 data_list_loding_status: 0,
                                 data_bottom_line_status: true
@@ -118,7 +119,8 @@
                                     share_info: {
                                         title: this.data_base.seo_title || this.data_base.application_name,
                                         desc: this.data_base.seo_desc,
-                                        path: '/pages/plugins/membershiplevelvip/index/index'
+                                        path: '/pages/plugins/membershiplevelvip/index/index',
+                                        img: this.default_images_data.default_bg_images || this.default_images_data.default_logo || ''
                                     }
                                 });
 
@@ -130,12 +132,12 @@
                                 }
                             }
                         } else {
-                            self.setData({
+                            this.setData({
                                 data_bottom_line_status: false,
                                 data_list_loding_status: 2,
                                 data_list_loding_msg: res.data.msg
                             });
-                            if (app.globalData.is_login_check(res.data, self, 'get_data_list')) {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
                                 app.globalData.showToast(res.data.msg);
                             }
                         }
@@ -146,7 +148,7 @@
                     fail: () => {
                         uni.hideLoading();
                         uni.stopPullDownRefresh();
-                        self.setData({
+                        this.setData({
                             data_bottom_line_status: false,
                             data_list_loding_status: 2,
                             data_list_loding_msg: '服务器请求出错'
diff --git a/pages/plugins/signin/index-detail/index-detail.css b/pages/plugins/signin/index-detail/index-detail.css
index add70e1b..82dbbe7c 100644
--- a/pages/plugins/signin/index-detail/index-detail.css
+++ b/pages/plugins/signin/index-detail/index-detail.css
@@ -77,4 +77,8 @@
 .coming-tips-container image {
     max-width: 100%;
     margin-top: 60rpx;
+}
+.coming-tips-content {
+    bottom: 30rpx;
+    left: calc(50% - 82rpx);
 }
\ No newline at end of file
diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index 70c285fb..d9e185e0 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -36,11 +36,6 @@
                     </view>
                 </view>
 
-                <!-- 广告图片 -->
-                <view  v-if="(data.right_images || null) != null" class="spacing-mb">
-                    <image class="wh-auto dis-block border-radius-main" :src="data.right_images" mode="widthFix" @tap="right_images_event"></image>
-                </view>
-
                 <!-- 公告信息 -->
                 <view v-if="(data_base.signin_desc || null) != null && data_base.signin_desc.length > 0" class="spacing-mb">
                     <view class="notice-content">
@@ -60,13 +55,13 @@
 
             <!-- 签到成功提示信息 -->
             <view v-if="is_success_tips == 1" class="coming-tips-container am-text-center">
-                <view class="coming-content tc">
+                <view class="coming-content tc pr">
                     <view class="icon-close-submit pa" @tap="coming_success_close_event">
                         <icon type="clear" size="46rpx"></icon>
                     </view>
-                    <image :src="static_url+'coming-success-icon.png'" mode="widthFix"></image>
-                    <view class="coming-tips-content">
-                        <text class="bg-white cr-red round padding-top-sm padding-bottom-sm padding-horizontal-main">获得 <text>{{coming_integral}}</text> 积分</text>
+                    <image :src="data.success_icon" mode="widthFix"></image>
+                    <view class="coming-tips-content pa">
+                        <text class="cr-red text-size-lg">获得 <text>{{coming_integral}}</text> 积分</text>
                     </view>
                 </view>
             </view>
@@ -85,12 +80,9 @@
     import componentNoData from "../../../../components/no-data/no-data";
     import componentBottomLine from "../../../../components/bottom-line/bottom-line";
     import componentGoodsList from "../../../../components/goods-list/goods-list";
-
-    var static_url = app.globalData.get_static_url('signin', true);
     export default {
         data() {
             return {
-                static_url: static_url,
                 data_bottom_line_status: false,
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
@@ -153,7 +145,7 @@
                                 data: data.data || null,
                                 team_signin_data: data.team_signin_data || null,
                                 user_signin_data: data.user_signin_data || null,
-                                is_already_coming: (data.user_signin_data || null) != null && (data.user_signin_data.integral || 0) > 0 ? 1 : 0,
+                                is_already_coming: (data.user_signin_data || null) != null && (data.user_signin_data.current_day || 0) == 1 ? 1 : 0,
                                 data_list_loding_msg: '',
                                 data_list_loding_status: 0,
                                 data_bottom_line_status: true
@@ -167,7 +159,7 @@
                                         desc: this.data.seo_desc,
                                         path: '/pages/plugins/signin/index-detail/index-detail',
                                         query: 'id='+this.data.id,
-                                        img: this.data.right_images
+                                        img: this.data.bg_images || this.data.logo || ''
                                     }
                                 });
                             }
@@ -313,15 +305,6 @@
                         }
                     });
                 }
-            },
-
-            // 图片事件
-            right_images_event(e) {
-                if ((this.data.right_images_url || null) != null) {
-                    uni.navigateTo({
-                        url: this.data.right_images_url
-                    });
-                }
             }
         }
     };