提交

app.js

@@ -8,8 +8,8 @@ App({
    * 全局变量
    */
   // apiRoot: "https://wj.songlanyun.com/wjxy/api/", // 正式环境api地址
-  apiRoot: 'http://192.168.0.181:8687/qyh/api/',
-  // apiRoot: 'http://192.168.0.193:8687/qyh/api/',
+  // apiRoot: 'http://192.168.0.181:8687/qyh/api/',
+  apiRoot: 'http://192.168.0.193:8687/qyh/api/',
   // apiRoot: 'http://192.168.0.232:8687/wjxy/api/', //黄理志
   // apiRoot: 'http://192.168.0.186:8687/wjxy/api/',
   siteInfo: require("siteinfo.js"),

pages/my/myCollection/myCollection.wxml

@@ -63,9 +63,9 @@
 				<view class="item">
 					<image mode="widthFix" src="/assets/images/online/icon_3.png" />
 					<text>名额：</text>
-					<text>200人</text>
+					<text>{{item.activity.willnum}}人</text>
 				</view>
-				<view class="tag">
+				<view class="tag" wx:if="{{item.activity.isNeedVip == 1}}">
 					<image mode="widthFix" src="/assets/images/online/icon_4.png" />
 					<text>会员免费</text>
 				</view>

pages/my/myPlay/myPlay.wxml

@@ -1,5 +1,6 @@
 <view class='w100 view-type flex-a-center'>
-  <view wx:for="{{typeList}}" class="view-li {{typeListIndex===index?'view-li-active':''}}" data-index="{{index}}" bindtap="switchType">
+  <view wx:for="{{typeList}}" class="view-li {{typeListIndex===index?'view-li-active':''}}" data-index="{{index}}"
+    bindtap="switchType">
     <text class="{{typeListIndex===index?'li-text-active':''}}">{{item.name}}</text>
   </view>
 </view>
@@ -8,26 +9,27 @@
     <view class='rel img-view img-view-item' data-id="{{item.activityId}}" bindtap='seeDetails'>
       <view class="activity-imgs-wrap {{typeListIndex==1? 'activity-imgs-wrap-after':''}}">
         <image mode="aspectFill" src="{{item.activity.thumbnailImg}}" class='activity-imgs'></image>
-        <image mode="aspectFill" src="{{appAssetsUrl}}/images/my/endActivity.png" wx:if="{{typeListIndex==1}}" class='icyover'></image>
+        <view class="activity-imgs-over" wx:if="{{typeListIndex==1}}">
+          <image mode="aspectFill" src="{{appAssetsUrl}}/images/my/endActivity.png" class='icyover'></image>
+        </view>
       </view>
       <view class='flex-a-right'>
         <view class="title">{{item.activity.title}}</view>
         <view class="item">
-          <i class="iconfont1 icon-date"></i>
+          <image src="/assets/images/online/icon_1.png" mode="widthFix"></image>
           <text>时间：{{item.activity.startTime}}-{{item.activity.endTime}}</text>
         </view>
         <view class="item">
-          <i class="iconfont icon-dizhi address-icon"></i>
-          <!-- <image class="address-icon" src="{{appAssetsUrl2}}wjxy/mine/address-icon.png"></image>选择 -->
+          <image src="/assets/images/online/icon_2.png" mode="widthFix"></image>
           <text>地址：{{item.activity.address}}</text>
         </view>
         <view class="item">
-          <i class="iconfont1 icon-faburen"></i>
-          <text>名额：<text class="red">{{item.activity.willnum}}</text>人</text>
+          <image src="/assets/images/online/icon_3.png" mode="widthFix"></image>
+          <text>名额：<text>{{item.activity.willnum}}</text>人</text>
         </view>
         <view wx:if="{{typeListIndex==0}}" class='flex-btn-wrap'>
-          <view class="btn c" data-id="{{item.activityId}}" catchtap='cancel'>取消活动</view>
-          <!-- <view class="btn s" data-tel="{{item.activity.teacherPhone}}" catchtap='calltech'>联系老师</view> -->
+          <view class="btn c mr10" data-id="{{item.activityId}}" catchtap='cancel'>取消活动</view>
+          <view class="btn s" data-tel="{{item.activity.teacherPhone}}" catchtap='calltech'>联系老师</view>
         </view>
       </view>
     </view>

pages/my/myPlay/myPlay.wxss

@@ -10,9 +10,6 @@ page {
 .view-type {
   justify-content: space-around;
   background-color: #fff;
-  border-bottom: 1px solid #e6e6e6;
-  /* background: #FFFFFF;
-border-bottom: 1px solid #F3F3F3; */
 }
 
 .view-li {
@@ -23,7 +20,11 @@ border-bottom: 1px solid #F3F3F3; */
   font-size: 32rpx;
   text-align: center;
 }
-
+.view-li-active .li-text-active{
+  color: #2B58A5;
+  font-size: 34rpx;
+  font-weight: 700;
+}
 .view-li-active::after {
   display: block;
   content: "";
@@ -31,14 +32,14 @@ border-bottom: 1px solid #F3F3F3; */
   bottom: 0;
   width: 100%;
   height: 4rpx;
-  background: #ffdd36;
-  border-radius: 2rpx;
+  background: #2B58A5;
+  border-radius: 4rpx;
 }
 
 .view-li > text {
   display: block;
   position: relative;
-  padding: 6rpx 25rpx;
+  /* padding: 6rpx 25rpx; */
   border-radius: 26rpx;
   box-sizing: border-box;
   font-size: 30rpx;
@@ -73,7 +74,8 @@ border-bottom: 1px solid #F3F3F3; */
   /* color: white !important; */
   /* display: flex; */
   color: #1a1a1a;
-  font-size: 32rpx;
+  font-size: 34rpx;
+  font-weight: 700;
 }
 
 /* .li-text-active::after{
@@ -116,35 +118,44 @@ border-bottom: 1px solid #F3F3F3; */
   align-items: center;
   height: 100%;
   position: relative;
+  background: #fff;
+  padding: 30rpx 23rpx;
+  box-sizing: border-box;
 }
 
 .activity-imgs-wrap {
-  width: 240rpx;
-  height: 240rpx;
+  /* width: 240rpx;
+  height: 240rpx; */
   /* position: absolute;
   left: 0;
   top: 0; */
-  margin-right: 34rpx;
+  margin-right: 20rpx;
   border-radius: 20rpx;
   /* z-index: 200; */
+  position: relative;
 }
 
 .activity-imgs {
-  height: 240rpx;
-  width: 240rpx;
-  border-radius: 20rpx;
+  height: 220rpx;
+  width: 220rpx;
+  border-radius: 10rpx;
 }
-
-.icyover {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  font-size: 150rpx;
-  color: #9ddb52;
+.activity-imgs-over{
+ position: absolute;
+ top: 0rpx;
+  left: 0;
+    width: 220rpx;
+  height: 220rpx;
+  background: rgba(255,255,255,0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
   z-index: 202;
-  width: 125rpx;
-  height: 125rpx;
+  font-size: 0;
+}
+.icyover {
+  width: 115rpx;
+  height: 100rpx;
 }
 
 .activity-imgs-wrap-after::after {
@@ -160,12 +171,14 @@ border-bottom: 1px solid #F3F3F3; */
 }
 
 .active-view-list {
-  width: 690rpx;
+  width: 100%;
   margin: 0 auto;
   margin-bottom: 15rpx;
-  padding-top: 30rpx;
-  padding-bottom: 20rpx;
-  border-bottom: 1rpx solid #e6e6e6;
+  background: #f7f8fa;
+border-radius: 40rpx 40rpx 0rpx 0rpx;
+padding: 30rpx 30rpx 20rpx;
+box-sizing: border-box;
+min-height: 90vh;
 }
 
 .flex-a-right {
@@ -191,6 +204,8 @@ border-bottom: 1px solid #F3F3F3; */
   text-overflow: ellipsis;
   /* width: 280rpx; */
   margin-bottom: 10rpx;
+  font-size: 30rpx;
+  font-weight: 700;
 }
 
 .flex-a-right .item {
@@ -247,12 +262,12 @@ border-bottom: 1px solid #F3F3F3; */
   display: flex;
   flex-direction: row;
   width: 100%;
-  justify-content: space-between;
+  /* justify-content: space-between; */
 }
 
 .flex-btn-wrap .btn {
-  width: 130rpx;
-  height: 50rpx;
+  width: 165rpx;
+  height: 60rpx;
   opacity: 1;
   display: flex;
   justify-content: center;
@@ -261,17 +276,18 @@ border-bottom: 1px solid #F3F3F3; */
 }
 
 .flex-btn-wrap .s {
-  background: #9ddb52;
+  background: #2B58A5;
   color: white;
 }
 
 .flex-btn-wrap .c {
-  background: #ffdc2f;
-  color: #1a1a1a;
-  color: #fff;
-  border: 2rpx solid #ffdc2f;
+  background: #C5DBFF;
+  color: #2B58A5;
+  /* border: 2rpx solid #ffdc2f; */
+}
+.mr10{
+  margin-right: 10rpx;
 }
-
 .view-type {
   justify-content: space-around;
 }

pages/my/myStudy/myStudy.wxml

@@ -157,7 +157,7 @@
         </view>
         <view class="prove" bindtap="upImg">
           <view class="student-box" wx:if="{{ !userphoto }}">
-            <image class="photo" src="{{appAssetsUrl2}}wjxy/studentimg.png"></image>
+            <image class="photo" src="/assets/images/online/icon_6.png"></image>
             <text>上传学历证明材料</text>
           </view>
 

pages/my/myStudy/myStudy.wxss

@@ -125,10 +125,10 @@
 }
 
 .box .prove .photo {
-  width: 249rpx;
-  height: 161rpx;
-  margin-top: 60rpx;
-  margin-bottom: 50rpx;
+  width: 274rpx;
+  height: 186rpx;
+  margin-top: 0rpx;
+  margin-bottom: 40rpx;
 }
 .student-box {
   display: flex;

pages/my/myTimejob/myTimejob.js

@@ -16,10 +16,10 @@ Page({
     }, {
       name: '待开始',
       value: '02'
-    },{
+    }, {
       name: '进行中',
       value: '03'
-    },{
+    }, {
       name: '已完成',
       value: '04'
     }],
@@ -51,7 +51,7 @@ Page({
     workFreezeTime: 0
   },
 
-  switchType(e) {
+  switchType (e) {
     if (e) {
       let typeListIndex = e.currentTarget.dataset.index;
       this.setData({
@@ -73,7 +73,7 @@ Page({
     this.getFreezesHour();
   },
 
-  seeDetails(e) {
+  seeDetails (e) {
     if (e.currentTarget.dataset) {
       wx.navigateTo({
         url: '/pages/home/index/partDetail/partDetail?id=' + e.currentTarget.dataset.id,
@@ -81,7 +81,7 @@ Page({
     }
   },
 
-  loadList(isRefresh) {
+  loadList (isRefresh) {
     let that = this;
     if (!isRefresh && this.data.noMore) {
       wx.showToast({
@@ -96,7 +96,7 @@ Page({
       params: {
         ...this.data.params,
         page: isRefresh ? 1 : this.data.params.page + 1,
-        newType: `0${this.data.typeListIndex+1}`,
+        newType: `0${this.data.typeListIndex + 1}`,
       }
     })
     wx.showLoading({
@@ -105,6 +105,9 @@ Page({
     app._post_form('work/mylistNew', '', this.data.params,
       function (res) {
         if (res.code == 0) {
+          res.data.list.map(v => {
+            v.work.tags = [{ tag: '11' }, { tag: '11' }, { tag: '11' }]
+          })
           if (res.data.list.length > 0 && that.data.listData.length > 0 && res.data.list[0].id == that.data.listData[0].id) {
             return;
           }
@@ -119,7 +122,7 @@ Page({
         }
       })
   },
-  calltech(e) {
+  calltech (e) {
     if (e.currentTarget.dataset.tel == null || e.currentTarget.dataset.tel == "") {
       wx.showModal({
         title: '温馨提示',
@@ -130,7 +133,7 @@ Page({
       wx.showModal({
         title: '温馨提示',
         content: '是否联系该兼职的老师?',
-        success(res) {
+        success (res) {
           if (res.confirm) {
             wx.makePhoneCall({
               phoneNumber: e.currentTarget.dataset.tel
@@ -143,12 +146,12 @@ Page({
     }
   },
 
-  cancel(e) {
+  cancel (e) {
     let _this = this
     wx.showModal({
       title: '温馨提示',
       content: `十分钟内可取消兼职;超过十分钟取消兼职账号将冻结${_this.data.workFreezeTime}小时,是否取消？`,
-      success(res) {
+      success (res) {
         if (res.confirm) {
           if (e.currentTarget.dataset) {
             let parm = {
@@ -169,7 +172,7 @@ Page({
               }
             )
           }
-        } else if (res.cancel) {}
+        } else if (res.cancel) { }
       }
     })
 
@@ -181,7 +184,7 @@ Page({
   onReady: function () {
 
   },
-  comment(e) {
+  comment (e) {
     if (e.currentTarget.dataset.isappraise) {
       wx.showToast({
         title: '您已经评价过了~',
@@ -235,7 +238,7 @@ Page({
   onShareAppMessage: function () {
 
   },
-  getFreezesHour() {
+  getFreezesHour () {
     let that = this;
     app._post_form('wgfillinfo/apiSelectwgfillinfo', '', this.data.params,
       function (res) {

pages/my/myTimejob/myTimejob.wxml

@@ -1,5 +1,6 @@
 <view class='w100 view-type flex-a-center flex-bet'>
-  <view wx:for="{{typeList}}" class="view-li {{typeListIndex===index?'view-li-active':''}}" data-index="{{index}}" bindtap="switchType">
+  <view wx:for="{{typeList}}" class="view-li {{typeListIndex===index?'view-li-active':''}}" data-index="{{index}}"
+    bindtap="switchType">
     <text class="{{typeListIndex===index?'li-text-active':''}}">{{item.name}}</text>
   </view>
 </view>
@@ -17,6 +18,15 @@
         <!-- <view wx:if="{{item.work.tags.length>0}}" class="list-tags">
         <button class="sale" wx:for="{{item.work.tags}}">{{item.tag}}</button>
       </view> -->
+        <view class="list-brief">
+          <view>
+            <i class="iconfont icon-dizhi icon-home-dizhi"></i>
+            <text class="area">{{item.work.address}}</text>
+          </view>
+          <view class="btn1 cencal" data-id="{{item.workId}}" catchtap='cancel'
+            wx:if="{{item.status == '02' || item.status == '01'}}">取消兼职</view>
+          <i class="iconfont1 icon-yiwancheng finish" wx:if="{{item.status == '03' || item.status == '04'}}"></i>
+        </view>
         <view class="pricewrap">
           <view class="price">
             <text class="p1">￥</text>
@@ -24,14 +34,14 @@
             <text class="p1">/{{item.work.unitName}}</text>
           </view>
         </view>
-      </view>
-      <view class="list-brief">
+        <text wx:for="{{item.work.tags}}" wx:for-item="item2">
+          <text class="label">{{item2.tag}}</text>
+          <text class="label" wx:if="{{index<2}}">|</text>
+        </text>
         <view>
-          <i class="iconfont icon-dizhi icon-home-dizhi"></i>
-          <text class="area">{{item.work.address}}</text>
+          <button class="label2"
+            wx:for="{{[item.work.categoryName,item.work.typeName,item.work.sexlimitName]}}">{{item}}</button>
         </view>
-        <view class="btn1 cencal" data-id="{{item.workId}}" catchtap='cancel' wx:if="{{item.status == '02' || item.status == '01'}}">取消兼职</view>
-        <i class="iconfont1 icon-yiwancheng finish" wx:if="{{item.status == '03' || item.status == '04'}}"></i>
       </view>
       <!-- <view class='list-status {{typeListIndex ==0?"":"hidden"}}'>
         <view class='flex-a-center list-status-wrap'>

pages/my/myTimejob/myTimejob.wxss

@@ -12,7 +12,7 @@ tab
 .view-type {
   justify-content: space-around;
   background-color: #fff;
-  border-bottom: 1px solid #e6e6e6;
+  /* border-bottom: 1px solid #e6e6e6; */
   /* background: #FFFFFF;
 border-bottom: 1px solid #F3F3F3; */
 }
@@ -33,7 +33,7 @@ border-bottom: 1px solid #F3F3F3; */
   bottom: 0;
   width: 100%;
   height: 4rpx;
-  background: #ffdd36;
+  background: #2B58A5;
   border-radius: 2rpx;
 }
 
@@ -43,7 +43,7 @@ border-bottom: 1px solid #F3F3F3; */
   padding: 6rpx 0;
   border-radius: 26rpx;
   box-sizing: border-box;
-  font-size: 28rpx;
+  font-size: 30rpx;
   font-family: PingFang SC, PingFang SC-Medium;
   font-weight: 500;
   text-align: left;
@@ -54,21 +54,25 @@ border-bottom: 1px solid #F3F3F3; */
 }
 
 .view-li .li-text-active {
-  /* transition: all .5s; */
-  color: #1a1a1a;
-  font-size: 32rpx;
+  color: #2B58A5;
+  font-size: 34rpx;
+  font-weight: 700;
 }
 
 
 .btn1 {
-  padding: 8rpx 20rpx;
+  width: 152rpx;
+height: 56rpx;
+background: #c5dbff;
+border-radius: 28rpx;
   font-size: 26rpx;
-  color: #1A1A1A;
-  color: #fff;
+  color: #2B58A5;
   border-radius: 28rpx;
-  background-color: #FFDC2F;
-  border-radius: 28rpx;
-  /* margin: 30rpx auto; */
+  position: absolute;
+  text-align:center;
+  line-height: 56rpx;
+  bottom: 37rpx;
+  right:29rpx;
 }
 
 .type-img {
@@ -135,16 +139,36 @@ btn2 {
   justify-content: space-between;
   align-items: center;
   line-height: 33rpx;
+  font-family: PingFang SC, PingFang SC-Bold;
+font-weight: 700;
+color: #1a1a1a;
+}
+.icon-home-dizhi{
+  color: #999999 !important;
+  font-size: 28rpx;
 }
-
 .list-brieft-fixx {
   width: 450rpx !important;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  margin-bottom: 28rpx;
+  margin-bottom: 0;
+  font-size: 24rpx;
+  color: #999999;
+}
+ .label2 {
+	box-sizing: content-box;
+	font-size: 22rpx;
+	font-weight: 400;
+	color: #767676;
+	height: 38rpx;
+	line-height: 38rpx;
+	padding: 4rpx 15rpx;
+	margin: 20rpx 13rpx 0 0;
+	background: #F0F1F5;
+	border-radius: 10rpx;
+	display: inline-block;
 }
-
 .list-brieft-fixx text {
   width: 95%;
 }
@@ -167,8 +191,8 @@ btn2 {
 
 .pricewrap {
   position: absolute;
-  right: 0;
-  top: 0;
+  right: 23rpx;
+  bottom: 125rpx;
   color: #EC2E26;
 }
 
@@ -237,19 +261,26 @@ btn2 {
 }
 
 .label {
-  font-size: 26rpx;
+  font-size: 24rpx;
   font-weight: 400;
   color: #767676;
   margin-right: 10rpx;
   display: inline-block;
+  color: #EC931A;
 }
 
 .list {
-  padding: 50rpx 60rpx 26rpx;
+  background: #f7f8fa;
+  border-radius: 40rpx 40rpx 0rpx 0rpx;
+  padding: 40rpx 30rpx;
 }
 
 .list-main {
   width: 100%;
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 30rpx;
+  box-sizing: border-box;
 }
 
 .finish {

project.private.config.json

@@ -3,12 +3,26 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/my/myStudy/myStudy",
-          "pathName": "pages/my/myStudy/myStudy",
+          "name": "pages/my/myTimejob/myTimejob",
+          "pathName": "pages/my/myTimejob/myTimejob",
           "query": "",
           "scene": null,
           "launchMode": "default"
         },
+        {
+          "name": "pages/my/myPlay/myPlay",
+          "pathName": "pages/my/myPlay/myPlay",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/my/myStudy/myStudy",
+          "pathName": "pages/my/myStudy/myStudy",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "/msg/pages/index/index",
           "pathName": "/msg/pages/index/index",