deal

package_first/pages/AddPicture/index.wxml

@@ -2,16 +2,30 @@
 <view>
     <view class="add_container">
         <view class="title">上传图片</view>
-            <view class="upload_image" bindtap="uploadImage">
+            <!-- <view class="upload_image" bindtap="uploadImage">
                 <view class="add_imageList" wx:for="{{imageList}}" wx:key="index">
                     <image style="width:100%;" mode="widthFix" src="{{item}}"></image>
                     <div class="close" data-current="{{index}}" catchtap="deleteImage"></div>
                 </view>
                 <view wx:if="{{imageList.length<5}}" class="upload_part">
-                    <image style="height: 70rpx;width:70rpx;" mode="widthFix" src="../../../assets/img/upload.png"></image>
+                    <image class="upload_img" style="height: 70rpx;width:70rpx;" mode="widthFix" src="../../../assets/img/upload.png"></image>
+                    <view class="upload_text">上传图片</view>
+                </view>
+            </view> -->
+            <view class="upload_images {{formRules.imageList.warning? 'warning': ''}}">
+            <view class="image_list">                              
+                <view class="image_preview" wx:for="{{imagePreviewList}}" wx:key="index">
+                    <image class="image_item" src="{{item}}" mode="aspectFill" data-item="{{item}}">
+                    </image>
+                    <div class="close" data-current="{{index}}" catchtap="deleteImage"></div>
+                </view>
+                <view class="upload_image" bindtap="uploadImage" wx:if="{{imageList.length<5}}">
+                    <image style="height: 56rpx;width: 56rpx; padding-top: 80rpx;" mode="widthFix" src="../../../assets/img/upload.png"></image>
                     <view class="upload_text">上传图片</view>
                 </view>
             </view>
+            <text class="tips">请先上传图片</text>
+        </view>
         <view class="button" bindtap="submit">
             提交
         </view>

package_first/pages/AddPicture/index.wxss

@@ -30,8 +30,8 @@
 }
 .close{
     position: absolute;
-    top:180rpx;
-    right:65rpx;
+    top:0;
+    right:0;
     transform: translate(40%,-40%);
     height:50rpx;
     width:50rpx;
@@ -39,8 +39,36 @@
     border-radius: 50%;
     z-index: 10;
   }
+  .close::before{
+    content: "";
+    display: block;
+    position: absolute;
+    width: 60%;
+    height: 6rpx;
+    top:50%;
+    left:50%;
+    background:rgb(124, 124, 124);
+    transform-origin: center;
+    /* transform: ; */
+    transform: translate(-50%,-50%) rotate(45deg);
+  }
+  .close::after{
+    content: "";
+    display: block;
+    position: absolute;
+    width: 60%;
+    height: 6rpx;
+    top:50%;
+    left:50%;
+    background:rgb(124, 124, 124);
+    transform-origin: center;
+    /* transform: ; */
+    transform: translate(-50%,-50%) rotate(-45deg);
+  }
 .upload_part {
     padding-top: 70rpx;
+    width: 100%;
+    height: 180rpx;
 }
 
 .upload_text{
@@ -63,4 +91,50 @@
 
 .add_imageList {
     width: 100%;
+}
+.tips{
+    position: absolute;
+    bottom: 150rpx;
+    left: 0rpx;
+    color: red;
+    font-size: 24rpx;
+    transform: translate(27rpx, -5rpx);
+    display: none;
+  }  
+  .form_item.warning .tips, .use_purpose.warning .tips, .upload_images.warning .tips{
+    display: block;
+  }
+  .image_item {
+    height:100%;
+    width: 100%;
+    margin-right: 30rpx;
+    margin-bottom: 20rpx;
+  }
+  .image_preview {
+    height: 250rpx;
+    width: 100%;
+    margin-right: 30rpx;
+    margin-bottom: 20rpx;
+    position: relative;
+  }
+  .image_list {
+    width: 100%;
+    margin-top: 20rpx;
+    padding: 20rpx 0;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+}
+  /* 上传图片 */
+  .upload_images {
+    width: 100%;
+    margin-bottom: 30rpx;
+    padding: 0 30rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    font-size: 28rpx;
+    color: #666666;
+    position: relative;
 }

package_first/pages/AttentionMethod/index.js

@@ -1,18 +1,26 @@
 // package_first/pages/AttentionMethod/index.js
+import { 
+    api_getIsApply
+} from  '../../../api/attention.js';
 Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-
+        status:null
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
+        // let status = options.status
+        // this.setData({
+        //     status
+        // })
+        // console.log(status);
+        
     },
 
     /**
@@ -26,7 +34,7 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow() {
-
+        this.getIsApply()
     },
 
     /**
@@ -62,8 +70,24 @@ Page({
      */
     onShareAppMessage() {
 
+    },
+    getIsApply(){
+        const {tenantId} = wx.getStorageSync('tenant')
+        const openid = wx.getStorageSync('openid')
+        const data = { openid }
+            api_getIsApply(data).then(res=>{
+        console.log(res);
+        this.data.status = res.data
+            })
     },
     goPage(e){
+        if(this.data.status == 1 ){
+            wx.showToast({
+              title: '您已参加该活动',
+              icon:"none"
+            })
+            return
+        }
         wx.navigateTo({
             url: `/package_first/pages/AddPicture/index`,
         })

package_first/pages/LearningVideo/index.js

@@ -14,6 +14,7 @@ Page({
             page:1,
             limit:10
         },
+        total:0,
         current: ''
     },
 
@@ -113,11 +114,11 @@ Page({
                 total,
                 list,
             })
-            if(list.status == 0){
-                data.entersList[0].isstudy = true
-            }else if(list.status == 1){
-                data.entersList[1].isstudy = true
-            }
+            // if(list.status == 0){
+            //     data.entersList[0].isstudy = true
+            // }else if(list.status == 1){
+            //     data.entersList[1].isstudy = true
+            // }
         })
     },
     handleDetail(e){

package_first/pages/LearningVideo/index.wxml

@@ -6,13 +6,13 @@
             <view class="cotent">
                 <view class="title">
                     <view class="title_text">{{item.videoTitle}}</view>
-                        <view class="{{item.status==1?'item__tag sutdying':item.status==0?'item__tag no--sutdy':'item__tag is--sutdy'}}">
-                            {{item.status==1?'学习中':item.status==0?'待学习':'已学习'}}
+                        <view class="{{item.status==2?'item__tag is--sutdy':'item__tag no--sutdy'}}">
+                            {{item.status==2?'已学习':'待学习'}}
                         </view>
                 </view>
                 <view class="title_content">{{item.videoBrief}}</view>
             </view>
         </view>
+        <view class="bottom">- 更多视频 敬请期待 -</view>
     </list>
-    <view class="bottom">- 更多视频 敬请期待 -</view>
 </view>

package_first/pages/LearningVideo/index.wxss

@@ -78,6 +78,7 @@
 }
 .bottom{
     width: 100%;
+
     font-size: 26rpx;
     font-family: Source Han Sans CN;
     font-weight: 400;

package_first/pages/ProtectionActivity/index.js

@@ -9,6 +9,7 @@ Page({
      * 页面的初始数据
      */
     data: {
+        tikStatus:null,
         entersList:[
             {
                 title:'关注抖音',
@@ -96,22 +97,32 @@ Page({
         const entersList = this.data.entersList
         const {tenantId} = wx.getStorageSync('tenant')
         const openid = wx.getStorageSync('openid')
-        if(tenantId !== 5){
+        if(tenantId !== 5 ){
             entersList[0].isShow = false
             this.setData({ entersList })
         }else{
             const data = { openid }
             api_getIsApply(data).then(res=>{
-                entersList[0].isJoin = !!res.data
-                this.setData({ entersList })
+                let tikStatus = res.data
+                entersList[0].isJoin = res.data == 2 ? true:false
+                this.setData({ entersList,tikStatus })
             })
         }
 
     },
     goPage(e){
         const { path } = e.currentTarget.dataset
+        // if(path=='/package_first/pages/AttentionMethod/index'){
+        //     wx.navigateTo({
+        //         url: '/package_first/pages/AttentionMethod/index?status='+this.data.tikStatus
+        //     })
+        // }else{
+        //     wx.navigateTo({
+        //         url: path
+        //     })
+        // }
         wx.navigateTo({
-            url: path
+        url: path
         })
     },
     homepage(e){

package_first/pages/videoDetail/index.wxml

@@ -6,7 +6,7 @@
     autoplay="{{false}}" 
     muted="{{true}}" 
     initial-time="{{ initialTime }}" 
-    show-progress="{{false}}"
+    show-progress="{{ control }}"
     show-mute-btn="{{true}}"
     enable-progress-gesture="{{false}}"
     bindtimeupdate="saveTime"

package_first/pages/videoDetail/index.wxss

@@ -1,3 +1,4 @@
+
 .video__header{
   width: 100%;
 }
@@ -25,7 +26,7 @@
   border-radius: 4rpx;
 }
 
-.no--sutdy{
+.no--study{
   background: #EBAC14;
 }