xcx 4 years ago
parent
commit
dcbe809aeb

+ 1
- 1
project.config.json View File

27
 			"outputPath": ""
27
 			"outputPath": ""
28
 		},
28
 		},
29
 		"useIsolateContext": true,
29
 		"useIsolateContext": true,
30
-		"useCompilerModule": false,
30
+		"useCompilerModule": true,
31
 		"userConfirmedUseCompilerModuleSwitch": false
31
 		"userConfirmedUseCompilerModuleSwitch": false
32
 	},
32
 	},
33
 	"compileType": "miniprogram",
33
 	"compileType": "miniprogram",

+ 1
- 1
src/pages/HuiQuanYi/index.vue View File

29
               <view class="Num"><text>{{index + 1}}</text></view>
29
               <view class="Num"><text>{{index + 1}}</text></view>
30
               <view class="flex-item">
30
               <view class="flex-item">
31
                 <text>{{item.title}}</text>
31
                 <text>{{item.title}}</text>
32
-                <text></text>
33
               </view>
32
               </view>
33
+              <text :class="{'active': item.typeId - 0 === 2}">{{item.typeId - 0 === 1 ? '喜' : item.typeId - 0 === 2 ? '书' : ''}}</text>
34
             </navigator>
34
             </navigator>
35
           </view>
35
           </view>
36
         </view>
36
         </view>

+ 13
- 0
src/pages/HuiQuanYi/page.scss View File

138
               }
138
               }
139
             }
139
             }
140
           }
140
           }
141
+          > text {
142
+            font-size: 24px;
143
+            background: #fe7e48;
144
+            line-height: 40px;
145
+            width: 40px;
146
+            text-align: center;
147
+            border-radius: 6px;
148
+            color: #fff;
149
+            margin-right: 20px;
150
+            &.active {
151
+              background: #ffa93a;
152
+            }
153
+          }
141
         }
154
         }
142
       }
155
       }
143
     }
156
     }

+ 8
- 5
src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.vue View File

42
               </view>
42
               </view>
43
             </view>
43
             </view>
44
           </view>
44
           </view>
45
-          <text @tap="ToPostActivityVote" v-if="!ShowVoteRes">提交</text>
46
-          <button open-type="getPhoneNumber" class="GetPhoneBtn" v-if="!DataLock && ShowGetPhoneBtn && !ShowVoteRes" @getphonenumber="GetPhoneNumber">授权手机号</button>
45
+          <text @tap="ToPostActivityVote" v-if="!ShowVoteRes && ActivityStatus">提交</text>
46
+          <button open-type="getPhoneNumber" class="GetPhoneBtn" v-if="!DataLock && ShowGetPhoneBtn && !ShowVoteRes && ActivityStatus" @getphonenumber="GetPhoneNumber">授权手机号</button>
47
           <view class="ResList" v-if="ShowVoteRes">
47
           <view class="ResList" v-if="ShowVoteRes">
48
             <view v-for="(item, index) in VoteResList" :key="index">
48
             <view v-for="(item, index) in VoteResList" :key="index">
49
               <view class="Text flex-h">
49
               <view class="Text flex-h">
71
         <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/fenxiang.png"></image>
71
         <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/fenxiang.png"></image>
72
       </view>
72
       </view>
73
       <button open-type="share" class="ShareBottomBtn" :class="{'active': IsEnroll}">分享</button>
73
       <button open-type="share" class="ShareBottomBtn" :class="{'active': IsEnroll}">分享</button>
74
-      <image mode="heightFix" v-if="IsEnroll && !HasEnroll" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/lijibaomingbtn.png" @tap="ToJoin"></image>
75
-      <button open-type="getPhoneNumber" class="GetPhoneBottomBtn" v-if="!DataLock && ShowGetPhoneBtn && IsEnroll && !HasEnroll" @getphonenumber="GetPhoneNumber">授权手机号</button>
76
-      <text v-if="IsEnroll && HasEnroll">已报名</text>
74
+      <image mode="heightFix" v-if="IsEnroll && !HasEnroll && ActivityStatus" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/lijibaomingbtn.png" @tap="ToJoin"></image>
75
+      <button open-type="getPhoneNumber" class="GetPhoneBottomBtn" v-if="!DataLock && ShowGetPhoneBtn && IsEnroll && !HasEnroll && ActivityStatus" @getphonenumber="GetPhoneNumber">授权手机号</button>
76
+      <text v-if="IsEnroll && HasEnroll && ActivityStatus">已报名</text>
77
+      <text v-if="!ActivityStatus">已过期</text>
77
     </view>
78
     </view>
78
 
79
 
79
     <!-- 授权头像获取弹窗 -->
80
     <!-- 授权头像获取弹窗 -->
92
   name: 'HuoDongXiangQing',
93
   name: 'HuoDongXiangQing',
93
   data () {
94
   data () {
94
     return {
95
     return {
96
+      ActivityStatus: false,
95
       HasEnroll: false,
97
       HasEnroll: false,
96
       ShowVoteRes: false,
98
       ShowVoteRes: false,
97
       VoteResList: [],
99
       VoteResList: [],
144
       this.GetActivityDetail({ urlData: { id: this.CurrnetId } }).then((res) => {
146
       this.GetActivityDetail({ urlData: { id: this.CurrnetId } }).then((res) => {
145
         this.ActivityInfo = res.data.data
147
         this.ActivityInfo = res.data.data
146
         this.IsEnroll = this.ActivityInfo.isEnroll
148
         this.IsEnroll = this.ActivityInfo.isEnroll
149
+        this.ActivityStatus = this.ActivityInfo.status - 0 !== 2
147
         if (this.IsEnroll) {
150
         if (this.IsEnroll) {
148
           this.HasEnroll = this.ActivityInfo.isSelfEnrolled
151
           this.HasEnroll = this.ActivityInfo.isSelfEnrolled
149
         }
152
         }

+ 2
- 1
src/pages/WoDe/MyRecommed/index.vue View File

11
         <!-- 列表 -->
11
         <!-- 列表 -->
12
         <view class="List" v-if="PageList.length">
12
         <view class="List" v-if="PageList.length">
13
           <view v-for="(item, index) in PageList" :key="index" class="Item">
13
           <view v-for="(item, index) in PageList" :key="index" class="Item">
14
-            <view>
14
+            <view class="flex-h">
15
               <text>{{item.name}}</text>
15
               <text>{{item.name}}</text>
16
               <text>{{item.sex - 0 === 1 ? '男' : '女'}}</text>
16
               <text>{{item.sex - 0 === 1 ? '男' : '女'}}</text>
17
               <text>{{item.phone}}</text>
17
               <text>{{item.phone}}</text>
18
+              <text class="flex-item" :class="[item.status - 0 === 1 ? 'Type1' : item.status - 0 === 2 ? 'Type2' : 'Type3']">{{item.status - 0 === 1 ? '审核通过' : item.status - 0 === 2 ? '审核不通过' : '未审核'}}</text>
18
             </view>
19
             </view>
19
             <text>备注:{{item.remark}}</text>
20
             <text>备注:{{item.remark}}</text>
20
           </view>
21
           </view>

+ 12
- 0
src/pages/WoDe/MyRecommed/page.scss View File

28
             &:first-child {
28
             &:first-child {
29
               color: #000;
29
               color: #000;
30
             }
30
             }
31
+            &:last-child {
32
+              text-align: right;
33
+              &.Type1 {
34
+                color: #29d61d;
35
+              }
36
+              &.Type2 {
37
+                color: #fe7e48;
38
+              }
39
+              &.Type3 {
40
+                color: #ffa93a;
41
+              }
42
+            }
31
           }
43
           }
32
         }
44
         }
33
         > text {
45
         > text {